blog.mrfrontend.org
Git 101 - STEP 4: merging branches, merge conflicts & cherry-pick
Today I want to show you how easy it is to merging branches, fix a merge conflict and how to use cherry-pick to get any commit your local branch!