I'm so used to GUI tools now... Trying to rebase and resolve merge conflicts from the CLI and feeling extremely rusty.
Caved, committed everything and checked out somewhere I could access with a GUI