You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
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".
The text was updated successfully, but these errors were encountered:
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?
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".
The text was updated successfully, but these errors were encountered: