> git does make merging easier. But the EC feature is extra large and complex, and it's probably not a good idea to merge it as-is. There are 150+ commits to the branch, and a lot of cases of a later commit overwriting an earlier one. That's why I made a pass to the consolidated patch and split it into 14 sub patches. Hopefully it helps the broader community to review the overall EC change.
150+ commits should not be a problem for git. We only need to generate a single patch for review. I doubt if splitting it into 14 sub patches would be helpful but it is no harm.
Anyway, we should use git to do the final merge. The patches are for Jenkins and review only.