Adrian Lang wrote: > > Moreover, you should not merge the upstream 0.7.x into your branches, because > these merge commits > clutter the commit timeline without any benefit. This only applies if the > merging is done > automatically. >
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. 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. Cheers, Ciaran _______________________________________________ Laconica-dev mailing list [email protected] http://mail.laconi.ca/mailman/listinfo/laconica-dev
