User stories for git-extract

@charlierudolph @allewun adding user stories that describe end-user value
As a developer extracting a commit when the main branch update has conflicts
I want to have the option to either abort or resolve these differences
So that I can deal with these conflicts at the best time without hurting my productivity.