Git PR Specific Single Commit
$ git fetch –all
$ git checkout -b my-single-change upstream/master
$ git cherry-pick b50b2e7
$ git push -u origin my-single-change
Git Single Commit Patch
git checkout
git format-patch -1 HEAD > ./
patch -p1 < ./
Git Merge Conflict Solve
https://stackoverflow.com/questions/161813/how-to-resolve-merge-conflicts-in-git
http://www.cnblogs.com/sinojelly/archive/2011/08/07/2130172.html