{"push_id":1193251481,"size":1,"distinct_size":1,"ref":"refs/heads/python-conflict-resolution","head":"d9a48613384779c8333d64ce03bc5d631319e969","before":"bb877bb4f8325ff6d2f89ee02f2dd4828ce11039","commits":[{"sha":"d9a48613384779c8333d64ce03bc5d631319e969","author":{"name":"Christopher Mancini","email":"b99a779f1d6c9b0f40a9eef37673124519965065@basho.com"},"message":"Based on other examples, this snippet is just focused on resolving the conflict, not having an updated object after the resolution has been stored on Riak. Removing obj.reload().","distinct":true,"url":"https://api.github.com/repos/basho/basho_docs/commits/d9a48613384779c8333d64ce03bc5d631319e969"}]}
{"actor":{"display_login":"christophermancini"}}