nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

Not able to merge branches in 2.4.8.0

Dmitri Peredera

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?

Accepted answers

All comments

Mike Corsaro

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

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.

DaleDeSilva

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

unknown

Same Here

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree

windows