Re: Git Vs. Svn for a project which *must* distribute binaries too.
Show 6 quoted lines
> - 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