diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-27 21:11:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-27 21:11:39 -0400 |
| commit | 1f09ae686ef35f8fd2d973754f8e1efd99161f4a (patch) | |
| tree | 075394fe7bec7092ef9b609b0d76d6f9bcbfdffc /doc/design/assistant/syncing.mdwn | |
| parent | 2d7ebc0582026bc1cadb8812861eb9a6467ba41d (diff) | |
update
Diffstat (limited to 'doc/design/assistant/syncing.mdwn')
| -rw-r--r-- | doc/design/assistant/syncing.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/design/assistant/syncing.mdwn b/doc/design/assistant/syncing.mdwn index 3e90e6b10..8b681ac10 100644 --- a/doc/design/assistant/syncing.mdwn +++ b/doc/design/assistant/syncing.mdwn @@ -17,7 +17,7 @@ all the other git clones, at both the git level and the key/value level. 1. Also, detect if a push failed due to not being up-to-date, pull, and repush. **done** 2. Use a git merge driver that adds both conflicting files, - so conflicts never break a sync. + so conflicts never break a sync. **done** 3. Investigate the XMPP approach like dvcs-autosync does, or other ways of signaling a change out of band. 4. Add a hook, so when there's a change to sync, a program can be run |