diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-22 17:17:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-22 17:17:41 -0400 |
| commit | 264dd38c6547406041adad4fea2c603d5a146a97 (patch) | |
| tree | f355c1600433ee1c73101f3a7847d08b2279f7b7 /doc/design/assistant/syncing.mdwn | |
| parent | 153942cc6eb4e1ab5ae730261aa3266fd1b41721 (diff) | |
blog for the day
Diffstat (limited to 'doc/design/assistant/syncing.mdwn')
| -rw-r--r-- | doc/design/assistant/syncing.mdwn | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/design/assistant/syncing.mdwn b/doc/design/assistant/syncing.mdwn index 05c7483dd..4f29df945 100644 --- a/doc/design/assistant/syncing.mdwn +++ b/doc/design/assistant/syncing.mdwn @@ -11,7 +11,8 @@ all the other git clones, at both the git level and the key/value level. that merges in received changes, and follow it by the part that pushes out changes (sending them to any other remotes). [The watching can be done with the existing inotify code! This avoids needing - any special mechanism to notify a remote that it's been synced to.] + any special mechanism to notify a remote that it's been synced to.] + **done** 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 |