'Resolve using theirs' not working??

[Didier Malenfant]

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?

[stevestreeting · Accepted solution]

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

[Didier Malenfant]

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

[windwagon]

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

[stevestreeting]

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.

[windwagon]

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

[windwagon]

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