git合并问题

git xue8 249天前 81次浏览



分支上传后,切换到master分支,执行git merge origin/分支名——git push后出现如下报错,
1.png
其次是如下代码:
Merge remote-tracking branch \'origin/detail-banner\'


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.


为什么会有这种问题的发生?求解?





回答:

你把你的代码编辑器都关了,找到那个.MERGE_MSG.swp文件,删除,再重新上传试试


0条回复
撰写答案