Just use magit as a git porcelain, I have used it because despite using git for 10 years I have no idea how it works other than only 5 commands since I just do not care how git works because I hate git and the cli is badly design. I don't know how magit is for rebasing though, but that sucks anyway and you should be merging instead, since a branch is just a pointer to a commit which is an immutable snapshot there is no point in switching branches.

I think thats bingo?