On Mon, 04 Feb 2008, John Goerzen wrote: > On Sun February 3 2008 10:47:59 am Raphael Hertzog wrote: > > On Sat, 02 Feb 2008, Kumar Appaiah wrote: > > > I was explaining how I would handle patches on top of upstream code. And > > where you have to update the patches when the upstream code changes. > > Rebase is exactly the process of "updating patches" while merge is really > > "keep the old patch and add fixups patch to reconcile after conflicts". > > From what I remember of looking at rebase when I was evaluating git, isn't a > side effect of it that it causes inconvenience for everyone that tracks your > tree? That is, if you are going to use rebase on a tree, it is generally a > private tree used on only one of your own machines, rather than something > that others pull from as well?
Yes it is. One needs to make it clear that a given branch is going to be rebased and can't be used for merging. Cheers, -- Raphaël Hertzog Le best-seller français mis à jour pour Debian Etch : http://www.ouaza.com/livre/admin-debian/ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
