Gentoo Archives: gentoo-science

From: "Justin (jlec)" <jlec@g.o>
To: Gentoo Science mailinglist <gentoo-science@l.g.o>
Subject: [gentoo-science] Git push problems
Date: Tue, 05 Nov 2013 20:29:02
1 Hi all.
3 I continuously see things like
5 $ git ph
6 Pushing to git@××××××.com:gentoo-science/sci.git
7 To git@××××××.com:gentoo-science/sci.git
8 ! [rejected] master -> master (non-fast-forward)
9 error: failed to push some refs to 'git@××××××.com:gentoo-science/sci.git'
10 hint: Updates were rejected because the tip of your current branch is behind
11 hint: its remote counterpart. Integrate the remote changes (e.g.
12 hint: 'git pull ...') before pushing again.
13 hint: See the 'Note about fast-forwards' in 'git push --help' for details.
14 Pushing to git+ssh://git@×××××××××××××××××××.org/proj/sci.git
15 To git+ssh://git@×××××××××××××××××××.org/proj/sci.git
16 = [up to date] master -> master
17 updating local tracking ref 'refs/remotes/origin/master'
18 Everything up-to-date
20 but a git pull doesn't bring anything new. This comes from problems with
21 fast-forwarding.
23 This is my suggestion here,
25 We will restrict the push access in to a
26 small group of people (one, two, three official sci team devs) and move
27 all other contributions over to github. This small team is then
28 responsible for the merge and shouldn't screw it up.
30 What do you think?
32 Justin


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


Subject Author
Re: [gentoo-science] Git push problems Nicolas Bock <nicolasbock@×××××.com>
Re: [gentoo-science] Git push problems Christoph Junghans <ottxor@g.o>
Re: [gentoo-science] Git push problems justin <jlec@g.o>