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:
http://xgm.de/oid/ 2015-08-24 19:41:34 +00:00 committed by admin
parent 986fdc92d2
commit 8529cb2ff6
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/forum/HowTo_Conflict_Resolution.mdwn
View file

@ -40,6 +40,7 @@ To /home/florian/Desktop/AA
83ff4c6..7df9834 git-annex -> synced/git-annex
b86e708..59a1240 annex/direct/master -> synced/master
ok
```
```
florian@horus ~/Desktop/BB (git)-[annex/direct/master] % git annex get .
@ -58,6 +59,8 @@ How can I resolve this conflict now? Is there a way to tell which bin1 / bin2 is
This case might appear somehow artifical but I was caught in that various times when syncing my music database. Actually I didn't care which version of the database it took, but I was unable to produce a coherent data set, so that the database files only come from one sync partner.
I did the git annex get after syncing, becaue usually I sync using --content.
Thanks,
Florian