20-01-methodic-rebase-merge

Investigate rebase conflicts against local main before executing, plan resolution for each conflict in advance.