Git Cherry Pick: Multiple Commits, Branches, Conflicts

Git cherry-pick explained: copy a commit from another branch, pick multiple commits or a range, fix conflicts, and know when merge or rebase fits better.