Resolve using 'Mine' ask me to confirm I want to use 'Their' state.

thomthom

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?

Dennis Field

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.