From 01b2724e512f7b58b4b34eedc39ba20932ab00ff Mon Sep 17 00:00:00 2001 From: "http://joeyh.name/" Date: Mon, 7 Oct 2013 17:08:34 +0000 Subject: [PATCH] Added a comment: How can I resolve a non-fast-forware on the git-annex branch? --- .../comment_2_528e92b21f0551fde4adb956654953ae._comment | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 doc/tips/centralized_git_repository_tutorial/comment_2_528e92b21f0551fde4adb956654953ae._comment diff --git a/doc/tips/centralized_git_repository_tutorial/comment_2_528e92b21f0551fde4adb956654953ae._comment b/doc/tips/centralized_git_repository_tutorial/comment_2_528e92b21f0551fde4adb956654953ae._comment new file mode 100644 index 0000000000..21b286fff2 --- /dev/null +++ b/doc/tips/centralized_git_repository_tutorial/comment_2_528e92b21f0551fde4adb956654953ae._comment @@ -0,0 +1,8 @@ +[[!comment format=mdwn + username="http://joeyh.name/" + ip="4.153.253.80" + subject="How can I resolve a non-fast-forware on the git-annex branch?" + date="2013-10-07T17:08:32Z" + content=""" +By either running `git annex sync`, or if you want to pull and push yourself, by running `git annex merge` before pushing. +"""]]