Inconsistent merge commit messages

What determines the commit message for a Git merge on SourceTree?

Occasionally I'll get a message indicating a branch merge, occasionally I'll get a message indicating a commit merge -- what triggers the difference, and is there any way to always force the "branch" option?

To be clear -- these are both occurring when trying to commit a separate branch back into master.

Example commit messages:

"Branch" style:

Merge branch 'apc'

"Commit" style:

Merge commit 'd5ba46c6c6275bc272cb29eb09ef28c0bc292578'

1 answer

1 accepted

Accepted Answer
0 votes

SourceTree takes the default commit message for a merge from what Git generates (it puts this in .git/MERGE_MSG) and would normally default to itself if you committed from the command line. We do this for consistency so people get what they'd expect from using the command line version.

Thanks for the reply, Steve. Looks like I'll have to dig into my Git book to see why it's giving inconsistent MERGE_MSG values.

Suggest an answer

Log in or Sign up to answer
Community showcase
Posted 4 hours ago in Canada

TOPIC TUESDAY - Fav Scary Monster!

Hey folks and happy Topic Tuesday! In the spirit of Halloween and all things scary, today's topic is what is your favourite horror movie monster. My personal choice here would be Jason from the Frida...

8 views 0 0
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