I found this confusing when I tried to merge a branch where I had a binary file with conflict. I wanted to keep the file in my current branch and discard the changes in the incoming branch:
However, I then get a messagebox me to confirm:
I'm confused by this, is this a typo?
A poor choice of a pronoun, I think. It is referring to the file's state as of the specified commit. You can make sure that you're resolving to the correct version of the file by looking at the ID of the commit, i.e. 8fe6d79... and comparing it with the rightmost column of SourceTree
By clicking the OK button, you'd be keeping 8fe6d79...'s version of the file.
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
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot