From fcee3b2089d0b5644fb1b74788871ec6c30a4a43 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 6 Jul 2015 18:14:45 -0400 Subject: [PATCH] comment --- ...ment_11_531e6a091c8d005626e4e8290ba317d7._comment | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 doc/forum/Question:_git-annex-only_repo___63__/comment_11_531e6a091c8d005626e4e8290ba317d7._comment diff --git a/doc/forum/Question:_git-annex-only_repo___63__/comment_11_531e6a091c8d005626e4e8290ba317d7._comment b/doc/forum/Question:_git-annex-only_repo___63__/comment_11_531e6a091c8d005626e4e8290ba317d7._comment new file mode 100644 index 0000000000..7f485a418f --- /dev/null +++ b/doc/forum/Question:_git-annex-only_repo___63__/comment_11_531e6a091c8d005626e4e8290ba317d7._comment @@ -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. +"""]]