mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Browse source
This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawkYmMFDdf3GJ9Oba6NCVkzGc4JyB9WavMs 2014-01-01 15:45:54 +00:00 • committed by admin
parent df29782e84
commit eac7e675ea
1 changed files with 53 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

53
doc/forum/How_to_resolve_a_interrupted_merge_in_direct_mode__63__.mdwn Normal file
View file

@ -0,0 +1,53 @@
I have just done a sync in a direct mode repo:
git-annex sync sshremote
It has quite a few conflicts (both sides adding the same file with same content). But somehow the merge won't conclude. Here's some log:
$ git-annex sync sshremote
commit ok
pull sshremote
warning: no common commits
remote: Counting objects: 32162, done.
remote: Compressing objects: 100% (31192/31192), done.
remote: Total 32162 (delta 3), reused 32162 (delta 3)
Receiving objects: 100% (32162/32162), 3.39 MiB | 1.61 MiB/s, done.
Resolving deltas: 100% (3/3), done.
From sshremote:/repo
* [new branch] annex/direct/master -> sshremote/annex/direct/master
* [new branch] git-annex -> sshremote/git-annex
* [new branch] master -> sshremote/master
* [new branch] synced/master -> sshremote/synced/master
Auto-merging file1
CONFLICT (add/add): Merge conflict in file1
Auto-merging file2
CONFLICT (add/add): Merge conflict in file2
Auto-merging file3
CONFLICT (add/add): Merge conflict in file3
Auto-merging file4
CONFLICT (add/add): Merge conflict in file4
Automatic merge failed; fix conflicts and then commit the result.
file1: needs merge
file2: needs merge
file3: needs merge
file4: needs merge
^C
I waited for a few minutes, and checked that both cpu and disk activity is near zero on both server. So I interrupted it, thinking it might be some locking issue.
But now I cannot sync with the remote anymore because the merge is still in process. How should I resolve the conflicts? I could do it manually if I cannot use annex's auto merge.
$ git-annex sync sshremote
commit ok
pull sshremote
fatal: You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
fatal: You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you can merge.
failed
$ git merge --abort
fatal: This operation must be run in a work tree