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

Browse source
This commit is contained in:
https://www.google.com/accounts/o8/id?id=AItOawmKPMUX0YHBjE93eBsEnacwZsddSDue3PY 2011-12-18 09:35:40 +00:00 committed by admin
parent 87c1c103ea
commit 9698eecf0f
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
doc/forum/using_git_annex_to_merge_and_synchronize_2_directories___40__like_unison__41__.mdwn Normal file
View file

@ -0,0 +1,7 @@
I would like to use git-annex to synchronize 2 directories in the same manner as unison.
I'm starting with 2 directories. There is an overlap of the same set of files in each directory, but each directory also has additional files as well.
I create a git annex in each directory but when I do a git pull it merges and produces conflicts on those files that are the same.
What is the correct workflow for this type of scenario?