On 05/11/13 21:31, Nicolas Bock wrote: > I have seen the same, but I don't understand what is going on. Why > doesn't a pull on gentoo update anything?
see the git push manual -> "NOTE ABOUT FAST-FORWARDS". Most common situation is that someone pushed something and ammended that commit and pushed again. > > > On Tue, Nov 5, 2013 at 1:28 PM, Justin (jlec) <[email protected] > <mailto:[email protected]>> wrote: > > Hi all. > > I continuously see things like > > $ git ph > Pushing to [email protected]:gentoo-science/sci.git > To [email protected]:gentoo-science/sci.git > ! [rejected] master -> master (non-fast-forward) > error: failed to push some refs to > '[email protected]:gentoo-science/sci.git' > hint: Updates were rejected because the tip of your current branch > is behind > hint: its remote counterpart. Integrate the remote changes (e.g. > hint: 'git pull ...') before pushing again. > hint: See the 'Note about fast-forwards' in 'git push --help' for > details. > Pushing to git+ssh://[email protected]/proj/sci.git > <http://[email protected]/proj/sci.git> > To git+ssh://[email protected]/proj/sci.git > <http://[email protected]/proj/sci.git> > = [up to date] master -> master > updating local tracking ref 'refs/remotes/origin/master' > Everything up-to-date > > but a git pull doesn't bring anything new. This comes from problems with > fast-forwarding. > > This is my suggestion here, > > We will restrict the push access in gitweb.overlays.gentoo.org > <http://gitweb.overlays.gentoo.org> to a > small group of people (one, two, three official sci team devs) and move > all other contributions over to github. This small team is then > responsible for the merge and shouldn't screw it up. > > What do you think? > > Justin > >
signature.asc
Description: OpenPGP digital signature
