Adhere to the 72-character limit. Another rule about how to write a git commit message properly is to limit the body width to 72 characters. Now, this doesn't mean you must set your text editor to ...

If some piece of information—a specific block of code, say—was changed in both branches, in different ways, Git would punt the question of which version belonged in the new commit back to the ...