The problem we're having is that git seems to enter a phase where it does not prompt for a comment. Then something changes, and it always asks for a "merge" comment. We can't pin down what is causing the apparent merge, because we are modifying the files in one place only. The message is:
Please enter a commit message to explain why this merge is necessary, especially if it merges an updated upstream into a topic branch. Lines starting with '#' will be ignored, and an empty message aborts the commit.
A procedure to troubleshoot this would be greatly appreciated.