Gentoo Archives: gentoo-science

From: Thomas Kahle <tomka@g.o>
To: Gentoo Science <gentoo-science@l.g.o>
Subject: [gentoo-science] Pushing to science on github
Date: Sun, 19 Aug 2012 12:03:45
Message-Id: 20120819092132.GB20093@schlaumatte.lan
1 ... fails
2
3 $ git pull --rebase && git push
4 Current branch master is up to date.
5 To git@××××××.com:gentoo-science/sci.git
6 ! [rejected] master -> master (non-fast-forward)
7 error: failed to push some refs to 'git@××××××.com:gentoo-science/sci.git'
8 To prevent you from losing history, non-fast-forward updates were rejected
9 Merge the remote changes (e.g. 'git pull') before pushing again. See the
10 'Note about fast-forwards' section of 'git push --help' for details.
11 Everything up-to-date
12
13 Why are they out of sync? Did I do anything wrong? What should be done
14 in this case?
15
16 Cheers,
17 Thomas
18
19 --
20 Thomas Kahle
21 http://dev.gentoo.org/~tomka/

Attachments

File name MIME type
signature.asc application/pgp-signature