我在foo.org上创建了一个中央裸共享仓库。用户A使用
git clone ssh://foo.org/blah.git
命令进行克隆。用户A创建了一个名为“lol”的空文件,将其提交到本地仓库并执行git push
命令。用户B使用mkdir foo
和cd foo
命令创建目录,并使用git clone ssh://foo.org/blah.git
命令进行克隆。用户B编辑了“lol”文件。用户A也编辑了“lol”文件,然后提交并使用git push
命令推送到中央仓库。用户B提交并使用git push
命令,但出现以下错误:
用户B使用error: failed to push some refs to 'ssh://foo.org/blah.git' To prevent you from losing history, non-fast-forward updates were rejected Merge the remote changes before pushing again. See the 'non-fast forward'
git pull
命令尝试解决问题,但出现以下错误:
用户B使用From ssh://foo.org/home/meder/central/foo 08a0cda..fba6968 master -> origin/master Auto-merging lol CONFLICT (content): Merge conflict in lol Automatic merge failed; fix conflicts and then commit the result.
vim lol
编辑文件,然后尝试使用git commit
命令,但出现以下错误:
此时,我应该怎么做?我尝试了lol: needs merge lol: unmerged (039727ec5a50d0ed45ff67e6f4c9b953bd23c17d) lol: unmerged (9307e337aa159ed6574eb84532f107685e46a16c) lol: unmerged (f88ad411f67850938dc369426cdbba76812e9126) error: Error building trees
git merge
命令,但它显示“fatal: You have not concluded your merge. (MERGE_HEAD exists)”错误。请问我该如何解决这个问题?