SourceTree crashes after resolving conflicts

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 vote

Seems to be fixed in 1.8.2.3 win

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

0 vote

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

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

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

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

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

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.

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Products

Interests

Groups

Community resources

Support

SourceTree crashes after resolving conflicts

2 answers

1 accepted

Suggest an answer

How to earn badges on the Atlassian Community

Brian Ganninger

Tip from the team: configuring Git or Mercurial in Sourcetree

Atlassian User Groups

Find my local user group

Groups near you