Learning how to use git
re-resolving another conflict on master after pull from branch
Making some more changes on the branch - editing some previous changes
some more changes on the branch
re-resolving conflicts on master after pull from branch
resolving conflicts and committing with visual studio plugin
let's make an edit to do a pull request