summaryrefslogtreecommitdiff
path: root/doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-06-25 20:40:58 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-06-25 20:40:58 -0400
commit336cee671e07164c37f01f26573bb9d584368a98 (patch)
tree2564959a5f0b6932dd2fb33001fbedf1890bce3e /doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn
parent17a8f60710a8794b16bbdd7b4155e9e7427bf5cc (diff)
blog for the day
Diffstat (limited to 'doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn')
-rw-r--r--doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn b/doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn
index 63431aae6..00f425307 100644
--- a/doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn
+++ b/doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn
@@ -10,3 +10,6 @@ hint: See the 'Note about fast-forwards' in 'git push --help' for details.
(Recording state in git...)
manually running a 'git annex sync' usually fixes it, I guess once the sync command runs periodically this problem will go away, is this even OSX specific? I don't quite get the behaviour that is described in [[design/assistant/blog/day_15__its_aliiive]].
+
+> With my changes today, I've seen it successfully recover from this
+> situation. [[done]] --[[Joey]]