Joseph Dunne <jdunne...@gmail.com> writes: > Valid point. The way my project is set up I always get a conflict on > merge operations, so technically all my merges (except fast forward > merges) end with a git-commit, which of course runs the commit-msg > hook. It seems everything is working as designed. Shame there isn't > a merge-msg hook. > > It seems I have no choice but to work around this issue. Thanks for your > help.
I think Stefan wanted to say in his message upthread that with an update still in flight you may not need a workaround.
