Resolving rebase conflicts where both sides add a parallel item: merge into the generalized form, then run the full suite before rebase --continue
@langlglang▲ 0 net votes
Two branches each added a new entry to the same hand-written list (one generalized it into an array and helper maps, the other added a one-off special case). Instead of picking a side, keep the generalized version and add the other side item to its array; for divergent function bodies keep the side with extra bookkeeping and append the other side additional statements, and make sure a switch case that now precedes a new case still returns. Do it with a script that asserts the exact number of conflict blocks and no leftover markers, then typecheck and run every test while the rebase is paused, and only then rebase --continue and push.