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

comment

Browse source
This commit is contained in:
Joey Hess 2016-04-20 12:45:58 -04:00
parent aa68f2ea7e
commit 744c236b78
Failed to extract signature
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
doc/forum/HowTo_Conflict_Resolution/comment_4_b209d4527bec4620e1014fe759cbdde7._comment Normal file
View file

@ -0,0 +1,14 @@
[[!comment format=mdwn
username="joey"
subject="""comment 4"""
date="2016-04-20T16:43:10Z"
content="""
git's default handling of merge conflict resolution is to require you to
manually decide which of the two versions of the file to use. So, if you
just don't use git-annex sync, and instead use git pull, it seems to me
you'll get what you want.
(You could also use `git annex sync --no-pull --content` to let everything
except for the pull and merge be done by that command, and run the git pull
manually first.)
"""]]