We have a set of files in our project that always cause trouble when switching between branches.
I have just switched from our "develop" branch to the "master" branch, but when I try to pull down the changes in "master" branch, I get:
error: Your local changes to the following files would be overwritten by merge:
Please, commit your changes or stash them before you can merge.
When I try to diff any of those files, there is actually no difference. I have checked with a hex editor and they are binary equal.
I try to create a stash, but the files still appear in my Pending Files list. I have to commit the "change" before I can pull down the actual changes for the branch.
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG