Category: Uncategorized

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 merging (https://help.github.com/articles/syncing-a-fork/), this is not always the best way. I do the following:

  1. git remote add upstream https://github.com/python/cpython.git
  2. git fetch upstream master
  3. git rebase upstream/master (no space here ‘/’ instead)

I hope this saves you some time as I continually waste time here.

New Car, New Shoulder + I’m Back …

Well well well, it has been awhile! The weekends have been busy and eventful and I just have not had the time / urge tow work on the site. Disappointing, yes I know. So things will change! 2008 s fast approaching.

I will endeavor to entertain again with the blog! And I might even try to work on SAC and get it all finished.

My shoulder surgery went well and it’s on the mend and feeling good. During this time I have also purchased my replacement car. It’s a Hot-House Green VY SS (pictured below). She is nice to drive and has a bit more grunt than the Suba! ha. Doesn’t mind to drink petty tho.

Anyways Merry Xmas and Happy new Year all !

 Hot-House Green VY SS