Checkout branch if missing in resolved goal.
Sequence execution of setup functions.
cherry-pick after rebase should get latest changes on feature branch.
resolved goal - ours instead of theirs
resolved goal - cherry-pick against master
Removed duplicate functions from resolved