mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fixup merges now done when needed

Browse source
This commit is contained in:
Joey Hess 2012-06-25 20:16:30 -04:00
parent 14015036bc
commit 05c4dfb941
3 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
doc/design/assistant/syncing.mdwn
View file

@ -15,7 +15,7 @@ all the other git clones, at both the git level and the key/value level.
**done**
1. Periodically retry pushes that failed. **done** (every half an hour)
1. Also, detect if a push failed due to not being up-to-date, pull,
and repush.
and repush. **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