'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

1 vote
Answer 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
Community showcase
Posted Jan 17, 2019 in Sourcetree

[dev team] Sourcetree for Windows 2019 Preview - Dark Theme

Hi folks, While the full post is over on our blog I'd like to share the dark theme we've got planned for 2019 here directly as well to keep the discussion going.  The ...

804 views 10 10
Join discussion

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