Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Git Pull failure due to pending commit results in an SCM status of 'Up to date'. #18

Open
NeoSword opened this issue Jun 24, 2015 · 1 comment

Comments

@NeoSword
Copy link

Hello,
In this case if a user tries to update(GIT) with edits to a local file copy and there have been edits to the same remote file the pull will fail as expected.
= [up to date] master -> origin/master
Updating c23fd2c..5e52943
error: Your local changes to the following files would be overwritten by merge:
SomeFileYouChanged.ps1
Please, commit your changes or stash them before you can merge.
Aborting

After this failure SCM notifier will (Correctly) show the pending commit still needed. But it will also report (Incorrectly)that your up to date(Green icon) and will not allow you to click "Update".

@pocorall
Copy link
Owner

pocorall commented Aug 9, 2015

As I tested with master branch, it is effectively classified as "need to update". Would you retry it with the most recent version, and let me know the more specific condition to reproduce it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants