How do I move a change to another branch?
If it is uncommitted, stash it. If it is committed, cherry-pick it.
It is not committed yet
- Save a stash, with a message. If only some of what you have done belongs on the other branch, select those files and use Stash Selected Files…: the rest stays where it is.
- Switch to the branch it belongs on.
- Restore the stash there.
Tick Delete stash after restoring in the confirmation and the third step is the last one: the stash is only deleted once the changes are actually back, so a restore that conflicts leaves it where it is.
Switching branches with uncommitted work also offers to auto-stash for you, which is the first two steps without the naming. The third is still yours: an auto-stash can restore itself onto the branch it was made on, which is the opposite of what you are doing here.
It is already committed
Cherry-picking copies a commit onto another branch. Innesta shows the state of a cherry-pick in progress and resolves its conflicts like any other, and a sequence started outside the app keeps whatever signing policy Git was given.
Starting one is a command line operation:
git cherry-pick <commit>
Then continue in Innesta.