So, every now and then on a PR I need to rebase and fix things so I can retest etc. - I always forget this so blogging it to remember.
I have a diff on origin/master on my forked repo and I need a rebase from upstream/master (where I forked from).
Github recommends merging (https://help.github.com/articles/syncing-a-fork/), this is not always the best way. I do the following:
- git remote add upstream https://github.com/python/cpython.git
- git fetch upstream master
- git rebase upstream/master (no space here '/' instead)
I hope this saves you some time as I continually waste time here.