User stories for git-sync

@charlierudolph @allewun adding user stories that describe end-user value
As a developer syncing a feature branch when there are conflicts between the local and remote main branches
I want to be given an opportunity to resolve differences