You are Fixing your Merge Conflicts The Wrong Way in VSCode

If you are using VSCode to fix your merge conflicts, this video is for you! The new 3-way merge editor makes your life easier as a developer with merge conflicts with an easy-to-use layout to go through and merge your commits.


⭐ Timestamps ⭐
00:00 Intro
00:40 New VSCode version!
01:25 Merge Conflicts in VSCode
03:40 3-Way Merge Editor


🧭 Build Login/Register API Server w/ Authentication | JWT Express AUTH using Passport.JS and Sequelize
   • Build Login/Register API Server w/ Au...  

🧭 Turn Design into React Code | From prototype to Full website in no time
   • Turn Design into React Code | From pr...  

🧭 Watch Tutorial on Designing the website on Figma
   • I Design a onecolor Website in 1 hour...  

🧭 Watch Create a Modern React Login/Register Form with smooth Animations
   • Create a Modern React Login/Register ...  

🧭 Debug React Apps Like a Pro | Master Debugging from Zero to Hero with Chrome DevTools
   • Debug React Apps Like a Pro | Master ...  

🧭 Master React Like Pro w/ Redux, Typescript, and GraphQL | Beginner to Advanced in React
   • Master React Like Pro w/ Redux, Types...  

🧭 Learn Redux For Beginners | React Redux from Zero To Hero to build a real-world app
   • Debug React Apps Like a Pro | Master ...  

🧭 Introduction to GraphQL with Apollo and React
   • Introduction to GraphQL with Apollo a...  


🐦 Follow me on Twitter:   / ipenywis  
💻 Github Profile: https://github.com/ipenywis

Made with 💗 by Coderone