Provide hints to users as to what caused a conflict

Whether a rebase or moving a fixup commit, the user might run into conflicts.  If we help tell them what actions are performed, they can disable those parts and move along.

Implementation idea: as we mutate the tree, we can capture the root of the mutation and an associated message.  Then, as we are running scripts, we can report those messages back out to keep them focused on relevant cases.