Western USA and Canada Adventures – Part One: California Coastal Cruising

In June I took three weeks leave and travelled to the USA and Canada to visit friends who live in various cities.

My trip began on a wet Wednesday morning in Sydney with a 15 hour flight to Los Angeles, followed by a one hour flight to San Francisco. With the exception of getting quizzed about my travel plans by various airline staff and border agents both in Sydney and Los Angeles the trip up with Delta was smooth and after being upgraded to Economy Comfort quite enjoyable.

Read more

Merging a git repository from upstream when rebase won’t work

I use a lot of open source software in my research and work.

In recent months I’ve been modifying the source code of some of open source repositories to better suit my needs and I’ve contributed a few small changes back to the DeepLearning4J and the Snacktory projects.

This morning I’m starting to work on a further patch for the DeepLearning4J repository and I needed to bring my local repository up to date before committing the change. However, at some point over the past few months the DeepLearning4J repository has been rebased and my fork of it will no longer merge.

Read more