Operations should finish depsite conflicts

[Opeyem1a]

Say you have a tree with main as the root and 2 branches from main called branch_1 and branch_2
You run switch to branch_1 and want to gum move it onto branch_2.

Let's say while doing this you run into a merge conflict (on the initial rebase, ignore the recursive rebases after for now). That will make gumption show you the rebase conflict output and then you resolve it. But after you resolve it, gumption still thinks branch_1 is based on main instead of branch_2. This is because the move command encountered the issue in the git operation before it did the tree operation.

The problem here is if you ran sync in this state, nothing will go wrong, but your branch_1 will still include the commits from branch_2. But running gum ls still tells you things are separate

[Opeyem1a]

Idea 1:

• Run tree commands before git commands always, this way the tree always gets the update and gum ls will just say it needs a restack in this case
• (Problem) Ensure this makes sense in other such cases