diff options
| author |  https://www.google.com/accounts/o8/id?id=AItOawmKPMUX0YHBjE93eBsEnacwZsddSDue3PY <Oliver@web> | 2011-12-18 09:35:40 +0000 |
|---|---|---|
| committer |  admin <admin@branchable.com> | 2011-12-18 09:35:40 +0000 |
| commit | 9698eecf0f7410e03300db772c528a465ef58dc1 (patch) | |
| tree | 4c6951485796de0af9d00c72fa92abfa34a6da8a | |
| parent | 87c1c103eacf153aeaa79be9fd896df147a76c10 (diff) | |
| -rw-r--r-- | doc/forum/using_git_annex_to_merge_and_synchronize_2_directories___40__like_unison__41__.mdwn | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/forum/using_git_annex_to_merge_and_synchronize_2_directories___40__like_unison__41__.mdwn b/doc/forum/using_git_annex_to_merge_and_synchronize_2_directories___40__like_unison__41__.mdwn new file mode 100644 index 000000000..86e317da8 --- /dev/null +++ b/doc/forum/using_git_annex_to_merge_and_synchronize_2_directories___40__like_unison__41__.mdwn @@ -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? |