GitHub PushEvent at 2014-12-08 00:46:22
Repository: Practising-Git-Workflow
Actor: RichardHancock
Payload: {"shas":[["2235611c3326d1f6acb06e84b96f677b033c7c5c","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@richardhancock.co.uk","Started a fake merge conflict.","Richard Hancock",false],["1f6a9187e2b5bde82f4ed9d61e8233e2860d4b85","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@richardhancock.co.uk","Merge remote-tracking branch 'remotes/origin/master' into dev\n\nConflicts:\n\tBaseCode.cpp","Richard Hancock",false],["311a7344014468f200df89988d9e3f37a9da6d40","b1c1d8736f20db3fb6c1c66bb1455ed43909f0d8@richardhancock.co.uk","Merge pull request #1 from RichardHancock/dev\n\nUpdated the core code (Brief Synopsis)","Richard Hancock",true]],"size":3,"ref":"refs/heads/master","head":"311a7344014468f200df89988d9e3f37a9da6d40"}