Ever have to update/merge a PR on BitBucket with Mercurial? I couldn't find documentation anywhere, so doing so here:
Especially because:
https://github.com/python/cpython/commit/47320a652e872003f3dd3a9db4243067b09dd316#diff-c6a3fa0ad7b17f8e32f340835a4e5353
🙂
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.
Scenario:
I have a diff on origin/master on my forked repo and I need a rebase from upstream/master (where I forked from).
Process:
Github recommends merging (https://help.github.com/articles/syncing-a-fork/), this is not always the best way. I do the following:
I hope this saves you some time as I continually waste time here.