SourceTree crashes after resolving conflicts

Kevin Reed February 16, 2016
  • Windows 10
  • SourceTree 1.8.1.0
  • 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
Answer accepted
Kevin Reed February 29, 2016

Seems to be fixed in 1.8.2.3 win

0 votes
Kevin Reed February 16, 2016

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

 https://twitter.com/sourcetree/status/699624992003244033

TransientResponse February 23, 2016

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

James Francis February 25, 2016

Same here. 1.8.2.0, 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
TAGS
AUG Leaders

Atlassian Community Events