rebase
BitBucket + hg + branch merges
Ever have to update/merge a PR on BitBucket with Mercurial? I couldn’t find documentation anywhere, so doing so here: hg up BOOKMARK_NAME hg merge [–preview] -r REV If EDITOR is not set: export EDITOR=vim hg resolve –all hg commit -m “Merge with default” hg push –allow-anon
GitHub + Rebasing from upstream/master to origin/master
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 […]