* Bernd Schmidt wrote: > Peter Kjellerstedt wrote: >>> -----Original Message----- >>> From: [email protected] [mailto:[email protected]] On >>> Behalf Of Mike Frysinger >>> Sent: den 29 april 2009 18:59 >>> To: [email protected] >>> Cc: [email protected]; [email protected] >>> Subject: Re: HEADS UP: svn->git transition >>> >>> On Wednesday 29 April 2009 12:52:29 Bernd Schmidt wrote: >>>> Bernhard Reutner-Fischer wrote: >>>>> git push -v --thin git+ssh://[email protected]/srv/git/uClibc.git >>>> Huh. Does git really work if multiple people push to the same >>>> repository? That's news to me. All the online examples seem to >>>> suggest using git push as a means to provide a git-pullable >>>> repository for others, but not for writing to a central repository. >>> afaik it should work fine. if you try to push and someone else already >>> has, you'll get the typical "rejecting non-fast forward update". > > That seems to be correct, I've reproduced this locally with some test > repositories. > >> It works fine, but requires some discipline. E.g., the GStreamer >> project uses git this way. One of the important things to remember when >> using a central git repository in this way is >> to always rebase the local repository before pushing. Otherwise >> you will end up with a lot of unnecessary merges. > > So what are the steps once you get the error message mentioned above? I > "git pull"ed after that and ended up with a merge.
You use "git fetch" to update the local repository with the latest changes from the remote repository, then use "git rebase origin/master" to rebase all local commits onto the master branch of the origin repository. origin/master can of course be substituted with any other branch as well. After that you can "git push" your new branch to the remote repository. > Bernd Thierry
signature.asc
Description: Digital signature
_______________________________________________ uClibc mailing list [email protected] http://lists.busybox.net/mailman/listinfo/uclibc
