Git Cherry Pick Tutorial

Learning any Git technique can be this easy:
learngit.io/
Newsletter readers get my videos early: newsletter.themoderncoder.com/
-----
What is Git cherry pick, and how do you use it? Cherry pick allows you to apply the changes introduced by one (or more) existing commits onto another branch. Cherry pick is similar to Git merge and rebase - but allows you to apply specific commits. In this tutorial I explain how to use Git cherry-pick, and illustrate the concepts with live animations. More: www.themoderncoder.com/git-ch...
CHAPTERS
0:00 Intro
0:30 Cherry pick vs merge vs rebase
0:55 Cherry pick example with a single commit
2:56 Cherry pick multiple commits
4:05 Cherry pick merge conflicts
MY TECH
www.themoderncoder.com/wfh-ny...
MUSIC CREDITS
uppbeat.io/t/danijel-zambo/st...
License code: MKSPZHWSMVNMSYST
#git #linux #learngit #programming #github

[@themoderncoder]

I have more Git videos! kzbin.info/aero/PLfU9XN7w4tFwKwh_xPSQ_X1-hROQEpHnM. Additionally, a written reference for this video is available on my blog: www.themoderncoder.com/git/

[@subramanyakrishnamurthy8352]

"No nonsense, just get to the point" videos. Very easy to follow and much appreciated!!

[@softwaredevx]

Crystal clear, to the point explanation. Love your teaching style with animations. Please keep on making videos.

[@mariocalderon2148]

Thank you, amazing! I was always "afraid" of using cherry picking, but with this excellent explanation I will use it often.

[@shivamthakur1176]

Straight to the point, easy to understand for the beginners with good animation

[@Empea4all]

Crystal clear, and just what I needed.

[@ewamewa2436]

Well explained, clear and to the point. Thank you 🙂

[@antonyjere]

Lovely! Thank you so much for this. You kept it dead simple, which is what we are looking for.

[@abcdabcd8605]

Amazing explanation. Those animations made it very easy to understand.

[@amoohesam]

Bro I just subscribed without any hesitation. Thank you for your great work!

[@SJMilnor]

Thanks, man. That was an ideal tutorial video. Straight to the point and clear animations to help. You rock!

[@showsshorts4696]

awesome super easy

[@gopikrishna1831]

tutorial is clean and crispy

[@iatheman]

Top teaching style on these videos!

[@pabloscloud]

Thanks, you made it very straight forward!

[@Alex-bc3tt]

Pure definition of getting straight to the point🙏🙏🙏🙏

[@hacikho]

Dudede I liked your teaching skills and visualization, and now I understood cherry pick. Awesome. Thanks

[@user-tz8mk6gu4w]

Wow, this is a great explanation! Thank you for sharing, helped me a lot to understand how cherry-pick works.

[@sourPollo]

You made it very easy to understand! Thank you!

[@nijuyonkadesu]

Simple and nice explaination !

[@AnantaAkash.Podder]

Well explained man... thanks for making it easy

[@josemartins-jumia]

You have the best git videos on the all internet. Congrats

[@SZOKE19940321]

the visualization really helps, appreciated!

[@kenansenagic384]

Great tutorial :)

[@ronshu123]

Very helpful ! Thanks man !

[@zakariyaechmaili5647]

thanks, clear and straight to the point ♥

[@moazelsawaf2000]

Thank you so much ❤

[@TheProtagonist555]

Wow.. how easily explained!

[@smileyboy2700]

Thank you. I was annoying developers with it before but it started to seem too bad so I wanted to take control of it and cherry pick myself so Devs can focus on code. Thank you

[@joaquimferreira4954]

Great tutorial mate, keep it up

[@bradburrick]

Awesome and thank you!

[@matk2283]

you are the best !! my take way: learned how to check the log of another branch without switching to it. learned the concept of cherry pick love your animation. my great gratitude to you for your time to teach us all this. you must be a very nice person !!. Thanks again ! Mathew. K from Colorado

[@davidmata3104]

The best git tutorial Ive ever seen

[@AVISH747]

Subscribed...! Thanks a lot.

[@sayemalmahdi6691]

Thanks man !! Keep up the good works.

[@ehsantavakoli2418]

That was awesome 👍

[@ucretsiztakipci6612]

Clean and very easy to understand thanks man!

[@themoderncoder]

Glad it helped!

[@damaroro]

straight to the problem, thanks

[@_duongductrong]

Thank u, so clearly

[@shashankkumar1633]

very nice explaination

[@yousufazad6914]

Good video

[@emilmathew2257]

Awesome video!!

[@vincenguyendev]

you're amazing , keep it the good work :)

[@themoderncoder]

Thank you!

[@AndresGutierrez-nb6qr]

Awesome. Gracias 🤝

[@marcosradix1]

awesome, thank you!

[@JIGNESHPATEL-qk4yg]

nice information

[@khalidsaifullahfuad]

Short sweet, great tutorial

[@themoderncoder]

Glad it helped

[@nathanmersha5295]

honestly I though I would die before learning cherry pick, thank you for the clear explanation

[@simscape7869]

Thank you so much

[@pelvispresley22]

wondered how the hell cherry pick worked for years after someone at an internship tried to show me years ago but in the most convoluted way. Now you've made me realize how easy it really is in just 5 mins and actual use cases for it. I was nervous about it for nothing lol thx man!

[@themoderncoder]

Honestly, it’s comments like yours that keep me motivated! Thanks for letting me know

[@user-cs8co2hg7n]

thanks man

[@gostixxxx]

Thanks! Very effective explanation. Even my cat now understood 😂

[@themoderncoder]

Lol excellent!

[@MalwareAttacker-nc4gx]

Thank brother

[@megharajdeepak]

Not sure if I am doing it right. I have 2 branches, dev and main. Let's say dev and main are in sync initially. At at present, my development work in going on and I have added 3 new commits to dev (main now lags by 3 commits). At this point of time there is a production issue and I add a fix on dev and make the 4th commit. After switching to main branch, if I run `git cherry-pick bd46315 `, it's pulling earlier 3 commits along with 4th one. I want to pull only the 4th commit: bd46315 (origin/dev, dev) 4.HOT FIX ADDED ede1f33 3.textarea added 88cdb80 2. select dd added c93667f 1. text input added 62d132f (HEAD -> main, origin/main) Initial commit

[@haikalyusuf4058]

Hey Jack, thanks for sharing about cherry-pick, I’ve actually been using it at work for the past month I’ve been meaning to ask, in this case, as the commit hashes are different, how would the resulting main branch look after merging the feature branch? I assume there would be 2 duplicate commits of the commits that were cherry-picked?

[@themoderncoder]

That's correct. Cherry pick just applies the changes introduced by the commits - so you're essentially duplicating the commits you've cherry picked. The example I gave in the video about a bug fix commit is deliberate, because that's one common situation where cherry pick is useful; however, most of the time you'll probably find merge or rebase a better tool to apply changes across branches.

[@javascript_developer]

Awesome

[@p.a8750]

Great video. Quick question - your example shows cherry picking into main. Can we use cherry pick to go from one branch to another (non main) branch?

[@themoderncoder]

Yes, you definitely can.

[@thenujansandramohan8930]

Underrated video

[@tzuuyaolee9402]

hello Jack, thx for your tutorial.. q: after cherry-pciked, it will be "merged" to the target branch? (or cherry-pick is a temporary solution for me to continue work on a project?)

[@themoderncoder]

You can think of stashes like setting aside your staging area. So unlike branches that can be merged, or commits that can be rebased, stashes aren't anchored to anything so when you say stashes are "merged" they're really just merged into staging area. This means when you pop out stashes there can be conflicts, but that's not quite the same type of conflict as a traditional merge conflict - this video might clear some of that up: kzbin.info/www/bejne/sHSXdZiid9eSfMk

[@RichFinelli]

At the end when you demo'd multiple commits being cherry picked, the more recent commit was listed first. If the recent commit built on top of the earlier commit, would it make sense to order them by earlier commit first and recent commit second when doing git cherry pick? I.e. git cherry-pick

[@themoderncoder]

Yes! If you're picking multiple I'd keep the same order as they originally were. Sorry - I didn't realize I did them out of order in the video. Good catch.

[@imprince95]

Very informative, but I have a question, what if we cherry pick a commit that has changes related to a piece of code that was introduced in a commit that we haven't cherry picked, what would happen then? Thanks a lot.

[@themoderncoder]

You’d get a conflict. The cherry pick operation will pause and notify you that it found incompatible changes. You can then choose to fix it or abort the cherry pick. I go over that workflow here if you’ve got time for another video: kzbin.info/www/bejne/l4bIf5WmiNCMbs0si=XY4HdGpHM6_QSU1S

[@imprince95]

@@themoderncoder Oh I see, will definitely check it out, thanks.

[@naktaal]

Do you think you could make a video where you explain cherry-picking merge commits?

[@themoderncoder]

Should be the same workflow since merge commits are just a bundle of all the changes introduced by that particular branch.

[@bartekz88]

Will you have a conflict after doing git rebase nav?

[@themoderncoder]

If you rebase nav against main AFTER the cherry pick, you won’t have a conflict because of the cherry picked commit. That said, it depends on what’s in the other commits on the nav branch, but the cherry picked commit won’t cause issues.

[@user-on8rk8cm1d]

but in vs code after i do the cherry pick why the changes is not detected? is it only me? or it's supposed to be like that?

[@themoderncoder]

Can you clarify what you mean?

[@the_univi_kid]

Too simple to not understand :)

[@KamelJabber1]

Seems too simple when you put it this way