diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-07-06 18:14:45 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-07-06 18:14:45 -0400 |
| commit | 3d80f70e9c0484f26d0ae98f45186beb2aa60276 (patch) | |
| tree | 639db1a1f1ecd0a7b95c8aeb107334e6aa5e67e5 | |
| parent | 982137ae51eb3170683b5babc183d6fa975178b7 (diff) | |
comment
| -rw-r--r-- | doc/forum/Question:_git-annex-only_repo___63__/comment_11_531e6a091c8d005626e4e8290ba317d7._comment | 12 |
1 files changed, 12 insertions, 0 deletions
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 000000000..7f485a418 --- /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. +"""]] |