update

1 files changed, 7 insertions, 2 deletions

diff --git a/doc/design/assistant/syncing.mdwn b/doc/design/assistant/syncing.mdwn
index 0a081c101..9cbdddcb9 100644
--- a/doc/design/assistant/syncing.mdwn
+++ b/doc/design/assistant/syncing.mdwn
@@ -5,9 +5,11 @@ all the other git clones, at both the git level and the key/value level.
 
 1. At regular intervals, just run `git annex sync`, which already handles
    bidirectional syncing.
-2. Investigate the XMPP approach like dvcs-autosync does, or other ways of
+2. Use a git merge driver that adds both conflicting files,
+   so conflicts never break a sync.
+3. Investigate the XMPP approach like dvcs-autosync does, or other ways of
    signaling a change out of band.
-3. Add a hook, so when there's a change to sync, a program can be run.
+4. Add a hook, so when there's a change to sync, a program can be run.
 
 ## data syncing
 
@@ -29,3 +31,6 @@ This probably will need lots of refinements to get working well.
 
 This assumes the network is connected. It's often not, so the
 cloud needs to be used to bridge between LANs.
+
+It would be nice if, when a USB drive is connected,
+syncing starts automatically.