User stories for git-hack

@charlierudolph @allewun adding user stories that describe end-user value
I like where thats headed. My only thoughts would be:

* change `choices` to `choice`
* change  `resolve these differences now` to `resolve the conflicts`
* remove `and remain productive`