SourceTree aborts merge

Hi!

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.

Thanks,

Christian

2 answers

Hi Christian,

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.


Kind Regards,
Henrique Lechner

Hi Henrique!

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?

Best Regards,

Christian

Hi Henrique!

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?

Best Regards,

Christian

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted yesterday in Featured Groups

Tuesday tips & tricks: What is the Atlassian Community?

It's officially Tuesday, which means it's officially time for another tip to help you better navigate this space we call the Atlassian Community. 😄 I got a great question from community member, Sa...

43 views 2 4
View post

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