Resolve Git Cherry Pick Merge Conflicts

Learning any Git technique can be this easy: learngit.io/
-----
🎥 GIT CHERRY PICK VIDEO: • Git Cherry Pick Tutorial
⌨️ WRITTEN ARTICLE: www.themoderncoder.com/fix-gi...
DESCRIPTION
In this video I will show you how to fix the two most common git merge conflicts that could come up during this workflow. Resolving git cherry pick conflicts applies the changes introduced by the selected commit(s) onto the current branch. If changes introduced by the picked commit conflict with changes on the current branch, you will see a git merge conflict.
CHAPTERS
0:00 Intro to Git merge conflicts
0:30 Demonstration of a merge conflict
1:54 Fixing the merge conflict
4:34 Merge conflict with local changes
MY TECH
www.themoderncoder.com/wfh-ny...
MUSIC CREDITS
uppbeat.io/t/danijel-zambo/st...
License code: LQUKNJGUWBL7FJLX
#git #linux #programming #github #learngit #coding #codingtips

[@josuerbague6851]

These videos are a treasure and should be protected for future generations.

[@iatheman]

You're on the way to the top with this style of explanation. Well done and thanks for making these.

[@GergalovSergey]

Thank you! Very clear and easy-to-use explanation!

[@AnantaAkash.Podder]

Your Videos are just the BEST Explanation about Git... with the Animation... it helps a lot

[@vincenguyendev]

looking forward to git-stash :)

[@themoderncoder]

Here you go - just posted today: kzbin.info/www/bejne/eISvq3RupKiHbck

[@jordigonzalez6672]

Great Graphical demonstration. Thanks!

[@lucienchu9649]

Well and clear explanation, thanks.

[@user-ln6yi9qu9v]

Great Explanation!!! All things are easy to understand because of Graphical demonstration.

[@themoderncoder]

Glad it was helpful!

[@niksingh710]

was searching for cherry pick and mate just gonna say you explained it in the most simplest and understandable way. those animation with actual commit Strings was so much helpful while seeing the commands get executed. Loved your content!!

[@themoderncoder]

Heck yeah, glad it helped

[@matk2283]

Brilliant !!. simplicity combine with your animation and your delivery = treasure of a story teller about git. anyone wants to learn git, better sit down/listen to this gentleman and soak it up. my friend, you are one in a million for sharing your knowhow and for that I am so Thankful !!.

[@yuriytopin8040]

Very clear explanation. Thank you, it was very helpful.

[@themoderncoder]

Git cherry pick tutorial: kzbin.info/www/bejne/n2eYaHWdlK10jas. I also have more Git videos! kzbin.info/aero/PLfU9XN7w4tFwKwh_xPSQ_X1-hROQEpHnM Lastly, a written reference of what was explained in this video is available at: www.themoderncoder.com/git/

[@FullMetalAlgorithmist]

Yo man, these are some seriously good underrated vids!❤

[@themoderncoder]

Appreciate it. If you ever come across someone who could benefit from a video of mine, please share it!

[@arcanelore168]

I love your content!

[@themoderncoder]

Thank you!

[@chino.lluvia2868]

Thank you so much. The best git videos I've ever seen.

[@themoderncoder]

Appreciate that compliment, wow!

[@user-gy9is8ut5m]

Good job bro!

[@sanjaykrishnan8379]

Thank you so much, Great Explation.

[@user-vr1od8gk5d]

damn those animations really making it easier to understand gj

[@gc368]

Explained in a very comprehensive way, well done, thanks. Do you mind sharing which tools and technics you used for recording this material? Would be interesting to see it as a separate video.

[@themoderncoder]

Thanks for the comment, glad these are helping you. I plan to release a comprehensive series of Git videos in the coming months, and after that will do a video on how I made these.

[@overrevvv]

Thank you so much for these fantastic videos.

[@themoderncoder]

Thanks for watching them :)

[@MdShamimRahman]

This is good stuff.

[@veronikas.1347]

thanks, it worked for me

[@isaacambi1914]

You are the best

[@the_univi_kid]

Impressive. Subscribed.

[@themoderncoder]

I saw you commented on both my cherry pick videos! Thanks for taking the time to say that - I really appreciate the support

[@poojaguru2516]

saved my life

[@tambuidev]

First of all, great video! Extremely helpful and I learned a lot. Secondly, I would argue that starting at 4:35, if you are encountering this problem, then you have a personal problem managing your own work. Try not to get into a situation where you yourself have manually edited the same file differently in two branches. Just my opinion 🤷

[@themoderncoder]

Yeah that’s fair, the example is a little contrived. It’s funny you point this out because I put off doing the screen recording for that part because I was struggling to think of a realistic, yet somewhat straightforward situation that would cause a merge conflict. But those two qualities don’t really go together when you’re talking about merge conflicts

[@kobi219040]

wow man!

[@zigzagging256]

Really informative video! But I have 1 question left: at 1:22 what would the "--skip" command do?

[@themoderncoder]

If you’re cherry picking multiple commits, -skip will tell Git to skip the current commit in the sequence and move onto the next one

[@zigzagging256]

@@themoderncoder so will it work as the abort-option for this particular commit or just postpone the conflict to the end of the sequence?

[@themoderncoder]

@@zigzagging256 yes exactly. It essentially works as an abort but only for that specific commit in the sequence.

[@zigzagging256]

@@themoderncoder understood. Thank you very much!

[@sidneyjacques1887]

Trying to get better with reading conflict diffs... when you did the manual resolution you excluded the instagram_username, how did you know to omit i? Does it matter which branch is newest?

[@themoderncoder]

In this case, all I was thinking about was manually editing that block to be whatever I wanted it to look like after the merge. It shouldn't matter which is newer because you're moving commits between branches. Since the branches are tracking two different "flows" of work, the timing of when those commits made it into the Git tree isn't relevant to what the merge should look like. If you're on a team, you'd need to collaborate with the author of the code block in question and work it out.

[@tambuidev]

I honestly think this was a miss on his part (especially by the fact that it was never explained in the video starting at 2:57). The nav branch included the instagram_username line but the main did not. When fixing the merge conflict, he should have known to keep that line in the final product because the nav branch developer added it.

[@themoderncoder]

I’d probably agree that keeping lines that were newly added (like instagram_username) won’t generally be a problem, but it’s not failsafe in all situations. The safer advice would be to confer with both branch authors, or make a case-by-case judgement call if you’re the subject matter expert. So I still stand behind the advice from earlier in the thread, but now that I’m talking through all this, I agree it was a miss not to include this nuance in the video. I should probably make a dedicated video on merge conflict resolution strategy.

[@Braven36]

What happen when nav is merged into main after a cherry pick. Will the old hashes for cherry pick commits be merged still?

[@themoderncoder]

If nav is merged using a "git merge" both commits remain (the original and the cherry-picked commit). If nav is rebased onto main, then the cherry-picked commit WON'T be replayed onto main and Git will output something like this: "warning: skipped previously applied commit"

[@Braven36]

@@themoderncoder Thanks

[@l3ertuz362]

@2:11 you rolled back but did not issue the cherry-pick command

[@themoderncoder]

Sorry about that confusion. I wanted to demonstrate what aborting the cherry pick would look like. Just imagine at 2:11 I never issued the abort in the first place.

[@aspineux]

Specifying the hash d81b1f0 in the commit subject is irrelevant because this commit could never reach the remote repository. If you do a git rebase of your nav branch or never push your nav branch!

[@themoderncoder]

You’re saying the cherry picked commit on main could never reach the remote repository? I guess what I was trying to demonstrate was that the nav branch was already in the remote repository because another collaborator authored it.