From: Thomas Glanzmann <thomas@glanzmann.de>
Date: Mon, 04 Jun 2007 17:57:51 GMT
Subject: Re: Git Vs. Svn for a project which *must* distribute binaries too.
Message-ID: <20070604175751.GL19935@cip.informatik.uni-erlangen.de>
In-Reply-To: <alpine.LFD.0.98.0706040857380.23741@woody.linux-foundation.org>

Hello,

>  - instead of doing a "git pull" that merges the two branches (your work, 
>    and the work that happened by somebody else in the central repo while 
>    you did it), you *may* also just want to do a "git fetch" to fetch the 
>    changes from the central repo, and then do "git rebase origin" to 
>    linearize the work you did on _top_ of those central repo one (so that 
>    it no longer looks like a branch, and looks linear)

>    In the "git rebase" case, you'll effectively merge your commits one at 
>    a time, and you may thus have to fix up *multiple* conflicts. So it's 
>    potentially more work, but it results in a simpler history if you want 
>    it.

Thank you a lot. I finally understood what "git rebase" is all about!

        Thomas