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

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?

1 answer

1 accepted

0 votes
Accepted answer

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.

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

841 views 3 2
Read article

Atlassian User Groups

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!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you