User stories for git-sync

@charlierudolph @allewun adding user stories that describe end-user value
As a developer syncing a feature branch the conflicts with the tracking branch
I want to be given an opportunity to resolve differences