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; } } }

Sourcetree merge branch into master automatically commits - why?

Simon Dib

Sometimes when I merge a branch into master the files automatically commit themselves ready for a push. Typically I would expect a merge to first appear in the Working Copy area so I can review which files I do actually want to commit or remove.

Am I performing the merge incorrectly? While I'm in the Master branch I right-click on the branch to merge in then click "Merge branch into master".

Confusingly this problem only happens some of the time. On occasion the files do appear in the Working Copy area as expected.

Any suggestions welcome!

Accepted answers

Seth

This happens because it is the way Git is designed to operate. The occasions when the files do NOT automatically commit are almost always because there is a conflict that needs resolved before you can commit.

There is good news, though. The fact that the merge is committed does not, in any way, prevent you from reviewing and modifying the changes. Review the diffs in the commit details, make any changes you need to make. Then, when you commit, select "amend previous commit".

All comments

Seth

Simon Dib

Ok, thanks that makes sense. One other question though - when it auto-commits it doesn't give me a chance to add a log message. For example, if I merge from branchA into master I'd like to add "Merge 'branchA' into Master". Instead what actually happens is it uses the last commit message from that branch.

From what you've suggest it sounds like I could do an "amend previous commit" and add the message there, but it seems like an extra unneccessary step, especially if I don't have any further actual file amendments?

Hope this makes sense .. ?

Seth

That does makes sense, but doesn't match the behavior of SourceTree on my machine. When I merge, the automatically-generated commit message is something like "Merge branch 'branchA' into master".

You might try a command line merge and see what commit message it uses.

erumhannan

@Seth this is also happening on my side its not creating merge commit that is "Merge branch 'branchA' into master"

Welcome!

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

Quick Links

Find more posts tagged with

sourcetree

mac