workflows for cherry-pick and revert
add the MIGHT_CONFLICT caveat to some places

This caveat is for commands that may put you in a conflict situation.