Resolve Git Cherry Pick Merge Conflicts

If this visual learning style clicks for you, I built https://LearnGit.io to be a more complete curriculum focusing on how Git actually works, rather than memorizing commands.

No pressure, just wanted to get the word out. It's also free for students!

-----

🎥 GIT CHERRY PICK VIDEO: https://www.youtube.com/watch?v=i657Bg_HAWI
⌨️ WRITTEN ARTICLE: https://www.themoderncoder.com/fix-git-cherry-pick-m...

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
https://www.themoderncoder.com/wfh-nyc-desk-tour-2022/

MUSIC CREDITS
https://uppbeat.io/t/danijel-zambo/stardust
License code: LQUKNJGUWBL7FJLX

#git #linux #programming #github #learngit #coding #codingtips