Evaluate use of incremental merge for CE --> EE

For an earlier project, I have used git-imerge to decrease the amount of conflicts I need to resolve at once. Maybe that would work for the CE → EE merge, too? It also has the advantage that intermediate results can be pushed, so that conflict resolution can be continued by somebody else. Using the rebase-with-history strategy probably makes the most sense here.