过去,我的dev
和master
分支以快进模式合并,而不要求我命名提交。一次,我直接将某些内容合并到master
,此后,它一直要求我为合并命名该提交,并进行名为Merge 'dev'
的其他提交:
Merge branch 'dev'
# 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.
我可以以某种方式修复我的树再次以快进模式合并吗?