Understanding Cherry Picking in Git | 2023

"🍒 Learn Git Cherry Picking in Git in Minutes! 🚀 Welcome to Happy Learnings !! 🌟 In this video, we'll show you how to pick and choose the commits you need, using real-life project examples. 🌱 Basically we will be working on a Movie Application IMDB like project, in which we have two branches DEV and UAT. DEV has below features: 1. Dark Mode Capability - Works fine 2. Search Movies - Works fine 3. View Movie Modal Popup - Defective 4. Load More Movies - Works fine UAT has simple movie view without about features. Using Cherry picking we will move all the working features from DEV to UAT environment leaving the defective commit. 🔗 Links: Doc: https://bit.ly/3Pn0VJz Github: https://github.com/AmirMustafa/Cherry-Picking-Git/commits/develop ⏰ Key Moments: 00:00 - Introduction 00:37 - Exploring Movies Project where we will implement Cherry Picking 01:00 - UAT Environment, Target branch to implement Cherry Picking 01:26 - DEV Environment, having 4 new feature (develop branch) 01:39 - Feature 1: Dark Mode (will push in UAT by Cherry Pick) 01:45 - Feature 2: Search Movies (will push in UAT by Cherry Pick) 01:58 - Feature 3: Load More Moview (will push in UAT by Cherry Pick) 02:13 - Seeing UAT and DEV (develop) commits in Github 03:43 - What is Cherry Picking? 06:00 - Why Cherry Picking? 06:43 - Cherry Picking Commands | Steps 11:57 - Cherry Pick continue vs quit vs abort and when to use each 12:39 - Implementing Cherry Pick in Movie Project 12:52 - Exploring UAT (Target branch) before Cherry Pick 13:47 - Selecting Commits to Cherry Pick (i.e. puch) from DEV 13:57 - Commits to push vs Defective Commit (one not to push) 14:33 - Pasting all Commits to push (i.e. cherry pick) 15:49 - First Cherry Pick 17:18 - Debugging Error (Root cause was trying to cherry pick already existing comit in UAT) 20:07 - Error Fixed (Root cause was trying to cherry pick already existing comit in UAT) 20:33 - First Cherry Pick (After fixing Error) 21:50 - Reviewing First Cherry Pick done in UAT Github 22:03 - Starting Cherry Pick for other 4 commits 24:46 - Observing after Cherry Pick all commits 25:05 - Reviewing Movie App in UAT after cherry pick (All Features came here) 25:27 - Reviewing Merge Conflict in one scenario in cherry picking 26:42 - Wrap Up Connect with me 👋 LINKEDIN ► https://www.linkedin.com/in/amirmustafa1 TWITTER ► https://twitter.com/amir__mustafa INSTAGRAM ► https://www.instagram.com/aamir__mustafa #Git #CherryPicking #Coding #Development #uat