diff options
author | https://openid.stackexchange.com/user/814e4910-8e9b-4fe5-83ef-ff863c1a7314 <BehemothTheCat@web> | 2015-02-14 00:11:40 +0000 |
---|---|---|
committer | admin <admin@branchable.com> | 2015-02-14 00:11:40 +0000 |
commit | be530fd7d43010cae67115a47e3f6110c6085ef5 (patch) | |
tree | b346a81cb715e73c950da6a9fd375e1e6550d2f0 | |
parent | fbaaacaf7fce6a706d4a5b7fb14e4e92d1949d1e (diff) |
Added a comment: push fails
-rw-r--r-- | doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment b/doc/bare_repositories/comment_2_c88216da0588562c851c2ceabbfebc0a._comment new file mode 100644 index 000000000..435040703 --- /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. + +"""]] |