On Thu, Nov 11, 2010 at 11:55:36AM +0100, Buddenhagen Oswald (Nokia-MS-Qt/Berlin) wrote: > maybe i should prototype a git-replay-merge. > just for the record: git merge --no-commit -s ours candidate^2 git cherry-pick -m 1 candidate
_______________________________________________ Opengov mailing list Opengov@qt-labs.org http://lists.qt-labs.org/listinfo/opengov