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

Added a comment

Browse source
This commit is contained in:
http://joey.kitenet.net/ 2012-04-23 14:29:03 +00:00 committed by admin
parent c3e6fb165e
commit 7de646596f
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/What_can_be_done_in_case_of_conflict/comment_1_5ca86b099dfa08a50f656ea03bf1dcd9._comment Normal file
View file

@ -0,0 +1,12 @@
[[!comment format=mdwn
username="http://joey.kitenet.net/"
nickname="joey"
subject="comment 1"
date="2012-04-23T14:29:03Z"
content="""
You handle conflicts in annexed files the same as you would handle them in other binary files checked into git.
For example, you might choose to `git rm` or `git add` the file to resolve the conflict.
[[Previous_discussion|forum/A_really_stupid_question]]
"""]]