addendum: On Wed, Nov 10, 2010 at 07:22:21PM +0100, Buddenhagen Oswald (Nokia-MS-Qt/Berlin) wrote: > so instead we cherry-pick the merges themselves, like every other > commit.
> and that actually works out of the box. > actually, it doesn't (it doesn't make the commit a merge). but that's easily substituted by doing a regular merge (using the second parent from the merge commit to be picked). only if conflicts appear, checkout --ours and apply the diff of the merge on top, add -u, commit. more or less. _______________________________________________ Opengov mailing list Opengov@qt-labs.org http://lists.qt-labs.org/listinfo/opengov
