如何在重新綁定時解決合併衝突？

interactive rebase in progress; onto 2e0a7b5 
Last commands done (6 commands done): 
    f 6d90337 show_user POD reworked 
    f 3bafc68 Minor Updates in User.pm POD 
    (see more in file .git/rebase-merge/done) 
Next command to do (1 remaining command): 
    f 6c3632d Moved /wiki/ into /lib/wiki/ 
    (use "git rebase --edit-todo" to view and edit) 
You are currently rebasing branch 'wiki' on '2e0a7b5'. 
    (fix conflicts and then run "git rebase --continue") 
    (use "git rebase --skip" to skip this patch) 
    (use "git rebase --abort" to check out the original branch) 

Unmerged paths: 
    (use "git reset HEAD <file>..." to unstage) 
    (use "git add/rm <file>..." as appropriate to mark resolution) 

1 added by them: ../lib/wiki/user_registration.pod 
2 added by us:  Registration.pod 
3 both deleted: user_registration.pod 

no changes added to commit (use "git add" and/or "git commit -a")

我用下一個命令來解決衝突：如何在重新綁定時解決合併衝突？

git add Registration.pod 
git add user_registration.pod 
git rm ../lib/wiki/user_registration.pod

git status在此之後：

interactive rebase in progress; onto 2e0a7b5 
Last commands done (6 commands done): 
    f 6d90337 show_user POD reworked 
    f 3bafc68 Minor Updates in User.pm POD 
    (see more in file .git/rebase-merge/done) 
Next command to do (1 remaining command): 
    f 6c3632d Moved /wiki/ into /lib/wiki/ 
    (use "git rebase --edit-todo" to view and edit) 
You are currently rebasing branch 'wiki' on '2e0a7b5'. 
    (all conflicts fixed: run "git rebase --continue") 

nothing to commit, working directory clean

但我不能繼續重訂git rebase --continue

error: could not apply 6c3632d... Moved /wiki/ into /lib/wiki/ 

When you have resolved this problem, run "git rebase --continue". 
If you prefer to skip this patch, run "git rebase --skip" instead. 
To check out the original branch and stop rebasing, run "git rebase --abort". 

fatal: Unable to create '/home/kes/work/projects/artcoin.io/artcoin/.git/MERGE_RR.lock': File exists. 

If no other git process is currently running, this probably means a 
git process crashed in this repository earlier. Make sure no other git 
process is running and remove the file manually to continue. 

Could not apply 6c3632d9d00bdc97ba3879cd3a10a2517891b284... Moved /wiki/ into /lib/wiki/ 
fatal: Unable to create '/home/kes/work/projects/artcoin.io/artcoin/.git/MERGE_RR.lock': File exists. 

If no other git process is currently running, this probably means a 
git process crashed in this repository earlier. Make sure no other git 
process is running and remove the file manually to continue.

如何解決這種衝突並繼續重新裝訂？

來源

2016-12-28 Eugen Konkov

使用'混帳mergetool'試過嗎？查看：'1添加了他們：../ lib/wiki/user_registration.pod'和'3兩個都刪除了：user_registration。＃ – Nogoseke

@LuísFelipeNogoseke：'$ git mergetool' 'Segmentation fault' '沒有文件需要合併＃ –

。 pod'你不應該完成'git add ../ lib/wiki/user_registration.pod'和'git rm user_registration.pod'嗎？ – Nogoseke

我通過後，那些我已經做了明確的做的最後一個命令解決這個問題：

git mv ../wiki/Registration.pod wiki/Registration.pod

所有命令：

git add Registration.pod 
git add user_registration.pod 
git rm ../lib/wiki/user_registration.pod 
git mv ../wiki/Registration.pod wiki/Registration.pod

刪除此文件（因爲段錯誤的）後：

rm /home/kes/work/projects/artcoin.io/artcoin/.git/MERGE_RR.lock

我繼續重新發放：

git rebase --continue

UPD

另一件事我注意到，儘管git commit在錯誤消息後：

fatal: Unable to create '/home/kes/work/projects/artcoin.io/artcoin/.git/MERGE_RR.lock': File exists. 

If no other git process is currently running, this probably means a 
git process crashed in this repository earlier. Make sure no other git 
process is running and remove the file manually to continue.

提交將提交

來源

2016-12-28 13:28:46

如何在重新綁定時解決合併衝突？

回答

相關問題