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

Merge branch 'automerge'

Browse source
This commit is contained in:
Joey Hess 2012-06-27 16:12:28 -04:00
commit f0d1af74e7
5 changed files with 180 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
doc/git-annex.mdwn
View file

@ -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