To cherry pick a commit, use the command:
git cherry-pick COMMITHASH
In case the cherry pick generates a merge conflict use:
git cherry-pick --abort
Or resolve the merge conflict. See how to do that in this video:
• Never fear merge conflicts again - gi...
Get my interactive git cheatsheet as soon as it's released here:
https://philomatics.com/git-cheatsheet/
My best video yet (interactive rebase)
• git interactive rebase - Undo, Edit &...
My first video on git rebase (without --interactive)
• git rebase - Why, When & How to fix c...
My Top 10 git shortcuts:
• My most used git aliases
Video on `git pull --rebase`:
• Never* use git pull
How to change your default editor in git:
• My most used git aliases
This video was created by the incredible Samuel Ellmauer, who wrote the script, made the animations and edited the video. Thank you very much, Samuel!
LEGAL DISCLAIMER
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
Everything here is for informational purposes only. All non-licensed clips used for fair use commentary, criticism, and educational purposes. See Hosseinzadeh v. Klein, 276 F.Supp.3d 34 (S.D.N.Y. 2017); Equals Three, LLC v. Jukin Media, Inc., 139 F. Supp. 3d 1094 (C.D. Cal. 2015).e