601ee470af
This fixes a problem I was seeing in the assistant where two remotes would attempt to sync with one another at the same time, and both failed pushing the diverged git-annex branch. Then when both tried to resolve the failed push, they each modified their git-annex branch, which again each blocked the other from pushing into it. The result was that the git-annex branches were perpetually diverged (despite having the same content!) and once the assistant fell into this trap, it couldn't get out and always had to do the slow push/fail/pull/merge/push/fail cycle. |
||
---|---|---|
.. | ||
android | ||
blog | ||
cloud | ||
deltas | ||
inotify | ||
partial_content | ||
polls | ||
progressbars | ||
screenshot | ||
syncing | ||
thanks | ||
webapp | ||
windows | ||
android.mdwn | ||
blog.mdwn | ||
cloud.mdwn | ||
comment_1_a48fcfbf97f0a373ea375cd8f07f0fc8._comment | ||
comment_2_6d3552414fdcc2ed3244567e6c67989d._comment | ||
comment_3_05223be50c889b2ed6bc4abf74116450._comment | ||
comment_4_fbbd93b55803ae21e6ba4b6568c2fafd._comment | ||
comment_5_f4e9af3fed6c27e8ff39badb9794064d._comment | ||
comment_6_c7ad07cade1f44f9a8b61f92225bb9c5._comment | ||
comment_7_609d38e993267195a80fecd84c93d1e2._comment | ||
comment_8_22b818e1a2a825efb78139271a14f944._comment | ||
comment_9_d052e2142da8b4838fb1edf791ea23ae._comment | ||
comment_10_f2233fad55c20686cf299bf6788f1f23._comment | ||
comment_11_a38f0f21c2346e65b786d791b6829f9b._comment | ||
configurators.mdwn | ||
deltas.mdwn | ||
desymlink.mdwn | ||
inotify.mdwn | ||
leftovers.mdwn | ||
OSX.mdwn | ||
pairing.mdwn | ||
partial_content.mdwn | ||
polls.mdwn | ||
progressbars.mdwn | ||
syncing.mdwn | ||
webapp.mdwn | ||
windows.mdwn |