People often find the LOCAL and REMOTE sides in rebases and merges confusing. I put together a repository and README to explain what’s going on, and why the sides flip for a rebase. Find out more here: https://github.com/james-world/merge-view/blob/master/README.md

Note to self: Bitbucket and Github’s instructions for uploading an existing local repo have this instruction:

git remote add origin <address>

But something in my set-up (posh-git?) adds a default origin entry causing this to fail with:

fatal: remote origin already exists

To fix this use:

git remote set-url origin <address>

And then upload as normal with:

git push -u origin

Maybe this post will prevent me having to look this up every time I run into it!