>>>>> On Fri, 19 Sep 2014, hasufell wrote: > There is no reason to roll back commits or do merge commits for the > keywords conflict use case. So I don't see what else needs > discussion here, except the proposal from ulm.
About an optimised merge driver for ebuilds? Please don't see this as a blocker for the migration. Ulrich
pgpVH2cxxftNs.pgp
Description: PGP signature
