diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-27 16:14:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-27 16:14:33 -0400 |
| commit | 8baff14054e65ecbe801eb66786a55fa5245cb30 (patch) | |
| tree | 6b94664f942ecbbda6def84cbe2b75bba10ce8f2 /doc/git-annex.mdwn | |
| parent | 3ede3a809725a1ce612730218aa52349f785b0de (diff) | |
| parent | 6677a99cb42e40baedfc98b1602171ec0c14f86b (diff) | |
Merge branch 'master' into assistant
Diffstat (limited to 'doc/git-annex.mdwn')
| -rw-r--r-- | doc/git-annex.mdwn | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/git-annex.mdwn b/doc/git-annex.mdwn index 965a07f0d..85a5a18f0 100644 --- a/doc/git-annex.mdwn +++ b/doc/git-annex.mdwn @@ -135,6 +135,11 @@ subdirectories). commands to do each of those steps by hand, or if you don't want to worry about the details, you can use sync. + Merge conflicts are automatically resolved by sync. When two conflicting + versions of a file have been committed, both will be added to the tree, + under different filenames. For example, file "foo" would be replaced + with "foo.somekey" and "foo.otherkey". + Note that syncing with a remote will not update the remote's working tree with changes made to the local repository. However, those changes are pushed to the remote, so can be merged into its working tree |