Bug:When collision accurs, choose "use my version" to resolve the collision went wrong

when collision accurs, usually i choose "use my version" or "use other's version" to resolve the collision, but i found that no matter which one i choose, it's always do the "use other's version". it's serious! this problem has been exist for a long time, hope a quick resolve. thanks a lot~

1 answer

This widget could not be displayed.

What OS and what version of SourceTree are you using?

thanks a lot for your reply~

this issue boring me for a long time.

it's only on windows, and from version 1.9 to the newest version~

Suggest an answer

Log in or Sign up to answer
Atlassian Summit 2018

Meet the community IRL

Atlassian Summit is an excellent opportunity for in-person support, training, and networking.

Learn more
Community showcase
Published May 30, 2018 in Sourcetree

Tip from the team: configuring Git or Mercurial in Sourcetree

Supported Platforms macOS Windows To make using Sourcetree as simple yet powerful as possible we embed (bundle) dependencies such as Git, Git LFS, and Mercurial. We strive to keep these...

724 views 1 3
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