Not on a Friday...

I was asked to merge some code changes I made a while ago onto the current branch of a project. We had a quick look and thought that it might actually just happen automatically by the magic of git. i got home and gave a go and decided it was all a bit too much for a Friday night and drank wine instead.

Managed to squeeze in a little more Watch Dogs, gradually getting the hang of it but boy is it taking time.