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

Merge branch 'master' of ssh://git-annex.branchable.com

Browse source
This commit is contained in:
Joey Hess 2014-06-13 11:15:09 -04:00
commit 55870556df
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/bugs/failed_sync_with_direct_mode_repo.mdwn Normal file
View file

@ -0,0 +1,7 @@
Two clients, both in direct mode, both running assistant.
When a change is made on A, the assistant commits it to annex/direct/master. But, the master branch is not changed.
B notices there is a change, pulls from A. Gets annex/direct/master, but does not merge it into its local branch at all.
[[!tag confirmed]]