When I try to do a merge in SourceTree the following situation happens very often:
Usually I start the merge using the "Merge" toolbar button. I then get the text "Merge:" before my repository in the left hand side repository list:
If I then have conflicts I start resolving them and at some point while resolving my conflicts the "Merge: " label vanishes and SourceTree seems to no longer recognize that I'm doing a merge. If I commit from such a stage the history doesn't show that I've merged (no joint history lines) and I still have two independent branch histories.
Why is that?
Any help is greatly appreciated cause this is really annoying, especiall when dealing with big complicated merges.
Look into this issue, I've found this bug report that seems related to this issue, as you can see on the following link:
This bug is fixed on version 1.9.4 (for MAC OS X).
If you still facing this issue let me know which version you are using.
I'm running SourceTree on Windows, so I think SRCTREE-2439 is not related to my situation.
Could it be, that an open NetBeans (or it's Git plugin) instance is the reason for loosing the merge state?
Atlassian Summit is an excellent opportunity for in-person support, training, and networking.Learn more
👋Community members! Downtime happens. And great incident response takes a village. Teams like Support, Dev, SRE, Ops, IT, and Marketing have to come together to resolve the problem while keep...
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!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG