blob: 879146deba496064cab2dadd0345812384593514 (
plain)
1
2
3
4
5
6
7
8
9
|
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]]
> [[fixed|done]] --[[Joey]]
|
