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 2015-07-06 18:14:45 -04:00
parent 9273ae2766
commit fcee3b2089
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
doc/forum/Question:_git-annex-only_repo___63__/comment_11_531e6a091c8d005626e4e8290ba317d7._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="joey"
subject="""comment 11"""
date="2015-07-06T22:13:24Z"
content="""
If using git-annex sync or git-annex merge to do the merging, it will
automatically resolve the merge conflict and put both conflicting versions
of the file in the tree under different filenames.
Of course, you can also use regular git commands to pull and merge your
master branch; then you'd get a regular git merge conflict.
"""]]