SourceTree crashes after resolving conflicts

  • Windows 10
  • SourceTree
  • system Git 1.9.5
  • P4Merge Rev. P4Merge/NTX64/2014.2/973065

When I resolve a conflict during a merge using P4Merge, when I close P4Merge after saving a resolution SourceTree crashes. Every time.

How can I fix this?

2 answers

1 accepted

0 votes
Accepted answer

Seems to be fixed in win

Looks like y'all are on top of it, reverted to 1.7.0.x for now, thanks!

@sourcetree Any updates? Still occurring on 1.8.2 with Visual Studio 2015 as a merge tool. 

Same here., Windows 10 and KDiff. Would be nice to get this fixed as my team are constantly (but inadvertantly) screwing me over with conflicts! I'll revert to the old version for now.

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

979 views 4 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