From 2a7d445f3a6d6c1d013473ced298d95957dfb543 Mon Sep 17 00:00:00 2001 From: "https://openid.stackexchange.com/user/814e4910-8e9b-4fe5-83ef-ff863c1a7314" Date: Sat, 14 Feb 2015 00:11:40 +0000 Subject: [PATCH] Added a comment: push fails --- ..._c88216da0588562c851c2ceabbfebc0a._comment | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment diff --git a/doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment b/doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment new file mode 100644 index 0000000000..4350407037 --- /dev/null +++ b/doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment @@ -0,0 +1,28 @@ +[[!comment format=mdwn + username="https://openid.stackexchange.com/user/814e4910-8e9b-4fe5-83ef-ff863c1a7314" + nickname="BehemothTheCat" + subject="push fails" + date="2015-02-14T00:11:40Z" + content=""" +These instructions don't work for me, unfortunately. + +This step: + + git push origin master git-annex + +results in: + + To ssh://my.server.com/home/itz/git/annex.git + ! [rejected] git-annex -> git-annex (non-fast-forward) + error: failed to push some refs to 'ssh://my.server.com/home/itz/git/annex.git' + hint: Updates were rejected because a pushed branch tip is behind its remote + hint: counterpart. Check out this branch and integrate the remote changes + hint: (e.g. 'git pull ...') before pushing again. + hint: See the 'Note about fast-forwards' in 'git push --help' for details. + +Versions: git 1:1.9.1-1~bpo70+2 , git-annex 5.20141024~bpo70+1 (both packaged by Debian, same on local and remote) + +And yes, I did a pull on the master branch first. Afraid to do anything +with the git-annex branch without explicit instruction. + +"""]]