User stories for git-ship

@charlierudolph @allewun adding user stories that describe end-user value
What was agreed on in #261:
```
I want to be given the choice to resolve the conflicts or abort
So that I can finish the operation as planned or postpone it to a better time.
```

Same for anywhere that are conflicts