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>2014-05-29 15:23:05 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-05-29 15:23:05 -0400
commit1f6cfecc972b121fa42ea80383183bbaccc2195a (patch)
tree0a450c4226f5e05c2a3597a9f520376de281fffe /doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn
parenta95fb731cd117f35a6e0fce90d9eb35d0941e26e (diff)
remove old closed bugs and todo items to speed up wiki updates and reduce size
Remove closed bugs and todos that were least edited before 2014. Command line used: for f in $(grep -l '\[\[done\]\]' *.mdwn); do if [ -z $(git log --since=2014 --pretty=oneline "$f") ]; then git rm $f; git rm -rf $(echo "$f" | sed 's/.mdwn$//'); fi; done
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.mdwn15
1 files changed, 0 insertions, 15 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
deleted file mode 100644
index 00f425307..000000000
--- a/doc/bugs/More_sync__39__ing_weirdness_with_the_assistant_branch_on_OSX.mdwn
+++ /dev/null
@@ -1,15 +0,0 @@
-Running the 'assistant' branch, I occassionally get
-
-To myhost1:/Users/jtang/annex
- ! [rejected] master -> synced/master (non-fast-forward)
-error: failed to push some refs to 'myhost1:/Users/jtang/annex'
-hint: Updates were rejected because a pushed branch tip is behind its remote
-hint: counterpart. Check out this branch and merge the remote changes
-hint: (e.g. 'git pull') before pushing again.
-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]]