From: Thomas Kahle <tomka@gentoo.org>
To: Gentoo Science <gentoo-science@lists.gentoo.org>
Subject: [gentoo-science] Pushing to science on github
Date: Sun, 19 Aug 2012 11:21:32 +0200 [thread overview]
Message-ID: <20120819092132.GB20093@schlaumatte.lan> (raw)
[-- Attachment #1: Type: text/plain, Size: 666 bytes --]
... fails
$ git pull --rebase && git push
Current branch master is up to date.
To git@github.com:gentoo-science/sci.git
! [rejected] master -> master (non-fast-forward)
error: failed to push some refs to 'git@github.com:gentoo-science/sci.git'
To prevent you from losing history, non-fast-forward updates were rejected
Merge the remote changes (e.g. 'git pull') before pushing again. See the
'Note about fast-forwards' section of 'git push --help' for details.
Everything up-to-date
Why are they out of sync? Did I do anything wrong? What should be done
in this case?
Cheers,
Thomas
--
Thomas Kahle
http://dev.gentoo.org/~tomka/
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 316 bytes --]
reply other threads:[~2012-08-19 12:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120819092132.GB20093@schlaumatte.lan \
--to=tomka@gentoo.org \
--cc=gentoo-science@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox