diff options
| -rw-r--r-- | doc/forum/What_can_be_done_in_case_of_conflict/comment_1_5ca86b099dfa08a50f656ea03bf1dcd9._comment | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/doc/forum/What_can_be_done_in_case_of_conflict/comment_1_5ca86b099dfa08a50f656ea03bf1dcd9._comment b/doc/forum/What_can_be_done_in_case_of_conflict/comment_1_5ca86b099dfa08a50f656ea03bf1dcd9._comment new file mode 100644 index 000000000..6f1d24130 --- /dev/null +++ b/doc/forum/What_can_be_done_in_case_of_conflict/comment_1_5ca86b099dfa08a50f656ea03bf1dcd9._comment @@ -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]] +"""]] |