On Tue, April 21, 2009 12:24 pm, Ciaran Gultnieks wrote: > On the other hand, it is better to have changes in a merge request that > are against the current version of the tree, not some old version.
If we would merge regularly (after days, not weeks), this would be no problem. > The correct way to handle this is to rebase against the upstream 0.7.x, > rather than merge. That gives the best of both worlds, since the clone > is still current, the patches are against the latest upstream, and the > new changes are at the top of the clone's history. I would like to see that explained, too. Regards, Adrian _______________________________________________ Laconica-dev mailing list [email protected] http://mail.laconi.ca/mailman/listinfo/laconica-dev
