'Resolve using theirs' not working??

Using Sourcetree during a rebade on a local git server, whether I choose 'Resolve using mine' or 'Resolve using theirs' to resolve a conflict, the same file (version) ends up getting written on on my local directory.

Is this normal?

3 answers

1 accepted

This is a bug. Logged, will be fixed in the next update hopefully: https://jira.atlassian.com/browse/SRCTREE-1249

I now have 1.5.5. Is this fixed in that release?

The link Steve pointed to indicates that the fix version is 1.5.6

Correct, this is earmarked for 1.5.6. I assume you're using the Mac App Store version, which gets updates often several weeks later than the direct version because of Apple's review delay, which is why you didn't have 1.5.5 already.

The link that Steve pointed to indicates that the fix version is 1.5.6.

The link that Steve pointed to indicates that the fix version is 1.5.6.

Suggest an answer

Log in or Sign up to answer
How to earn badges on the Atlassian Community

How to earn badges on the Atlassian Community

Badges are a great way to show off community activity, whether you’re a newbie or a Champion.

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...

560 views 1 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