diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-23 01:19:33 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-23 01:19:33 -0400 |
| commit | 3118eeb63fbd5ae6565c49c1e8d14f61b6f8f810 (patch) | |
| tree | 539f967617ffd24015f03d98a2177e5f88467c45 | |
| parent | 264dd38c6547406041adad4fea2c603d5a146a97 (diff) | |
update
| -rw-r--r-- | doc/design/assistant/syncing.mdwn | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/design/assistant/syncing.mdwn b/doc/design/assistant/syncing.mdwn index 4f29df945..8173457c5 100644 --- a/doc/design/assistant/syncing.mdwn +++ b/doc/design/assistant/syncing.mdwn @@ -13,6 +13,8 @@ all the other git clones, at both the git level and the key/value level. [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.] **done** +1. Periodically retry pushes that failed. Also, detect if a push failed + due to not being up-to-date, pull, and repush. 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 |