Never* use git cherry-pick

Git cherry-pick can cause critical bugs and security flaws. Book a workshop with me here: https://philomatics.com/git-workshop/ Or grab my free git cheatsheet here: https://philomatics.com/git-cheatsheet/ Check out this repo that demonstrates the issue here: https://github.com/Philomatics/git-cherry-pick-problem My most useful video yet (interactive rebase) https://youtu.be/42392W7SgnE My first video on git rebase (without --interactive) https://youtu.be/DkWDHzmMvyg My Top 10 git shortcuts: https://youtu.be/CAnQ4b0uais Fixing merge conflicts: https://youtu.be/DloR0BOGNU0 Video on `git pull --rebase`: https://www.youtube.com/watch?v=xN1-2p06Urc How to change your default editor in git: https://youtu.be/CAnQ4b0uais?t=131 BIG Thank You to Samuel Ellmauer for coming up with the concept and creating the amazing animations of this video! Contents: 0:00 - Git Cherry pick causes bugs 0:25 - Simple example 2:02 - How did this happen? 3:18 - How to fix 5:14 - General guidelines 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).eo