On 18 February 2014 15:32, Markus Armbruster <arm...@redhat.com> wrote: > Quick experiment to gauge the likelihood of conflicts: I reran > coccinelle on v1.7.0, then attempted to merge the result into master. I > got *two* conflicts. I backed out with "git-merge --abort", then merged > with "git-merge -s recursive -X ours g_new.old" to drop both conflicting > hunks, and the result is just fine. > > Peter, would you be willing to honor a pull request?
I've thought about this for a few days and (especially given Kevin's recent complaint about another cleanup that didn't go through the right subtrees) I think the answer is no. Split it up into manageable pieces and submit them separately via the appropriate submaintainers, please. thanks -- PMM
