Hi, after a "git merge --squash" with a conflict the commit message is not helpful as it only includes the conflicted files information, however, I expect to see the content of SQUASH_MSG which contains the summary of the merged commits. SQUASH_MSG seems to be just ignored. I think git should either read SQUASH_MSG and append COMMIT_MSG or add the conflict information into SQUASH_MSG and create no COMMIT_MSG. References: * https://stackoverflow.com/questions/3605385/merge-conflicts-ruin-my-commit-message-while-squashing-commits * https://gitlab.com/tortoisegit/tortoisegit/issues/1902 -- Best regards, Sven Strickroth PGP key id F5A9D4C4 @ any key-server -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html