- 我在foo.org做了一箇中央裸分享回購。
- 用戶A已完成
git clone ssh://foo.org/blah.git
- 用戶A創建了文件'lol',它是一個空白文件。提交給本地回購。是否
git push
- 用戶B確實
mkdir foo
和cd foo
- 用戶B,然後做
git clone ssh://foo.org/blah.git
。 - 用戶B編輯
lol
文件。 - 用戶A編輯
lol
文件。 - 用戶A提交和
git push
到中央回購 用戶B提交和
git push
和給出:我該如何解決這個git衝突?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'
用戶B則
git pull
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.
用戶B則
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)
我知道我確實在做一些愚蠢的錯誤。有人能指出它是什麼嗎?
可能重複的[如何解決Git中的合併衝突?](http://stackoverflow.com/questions/161813/how-doi-i-fix-merge-conflicts-in-git) – bzlm 2010-10-28 19:08:46