Not able to merge branches in 2.4.8.0

Dmitri Peredera March 25, 2018

Hello,

I've got a strange problem. I am trying to merge a branch into my current branch, but sourcetree does nothing.

I see message "Do you want to merge 'zzz' into your current branch", press OK.

I can see the merge window flash for a second and disappear.

But there are no changes in the working copy and no merge is actually done.

Anybody else with this problem?

1 answer

0 votes
Mike Corsaro
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
March 28, 2018

Hello!

If you've right-clicked on a branch and merged it, the merge will automatically commit immediately if there are not any conflicts. If you do not want this to happen: use the "Merge" button in the toolbar which will bring up a more advanced dialog that will give you more options such as the ability to disable this behavior.

Mark McDonagh October 28, 2018

I think you've misunderstood the problem because I have the same issue. I do the merge and see the same thing Dmitri does and no new commit is created

Like Izzy likes this
DaleDeSilva October 28, 2019

I've experienced this multiple times also. Whether using the merge button or right clicking. Nothing ends up happening.

Like Izzy likes this
Deleted user April 2, 2020

Same Here

Izzy December 16, 2021

How did you solve the problem? Because I have the exact same problem...

DaleDeSilva December 20, 2021

I can't remember, unfortunately. But I suspect I either...

  • Used the terminal to do the merge (look up git merge)

Or

  • Used GitHub Desktop. This is git's own program like SourceTree. It's possible the free version doesn't allow merges, but I can't remember. If this works, it would probably be the easiest option for you if you're not comfortable with terminal.

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events