Christian Boos wrote: > These branches are best kept linear, for easier integration > upstream. If after a while, the changes don't apply anymore > on latest code from upstream, then you should rather rebase > the changes instead of merging with upstream, as it's more > difficult to examine and reintegrate a branch if it contains > merge changesets.
I still don't understand why people keep wanting to rebase instead of merge. I have been working with Mercurial for years now, and I still haven't had a valid use case for rebasing. The same applies to MQ, for that matter. The only "difficult" operation is showing a diff of the branch against upstream, as you have to find the last merged revision. But that's easily solved with a revset expression and an alias (at least with Mercurial). But maybe it's just me... -- Remy
signature.asc
Description: OpenPGP digital signature
