Resolve Git MERGE CONFLICTS: The Definitive Guide

This is the definitive tutorial on how to resolve merge conflicts in Git. We'll cover why merge conflicts happen, and learn how to fix the two most common types of conflicts. This video covers resolving conflicts using command line Git (and a terminal text editor like VIM) as well as an IDE like VS Code. At the end of this video, I also share a cheatsheet you can use to solve merge conflicts.

----

CHAPTERS
0:00 Intro
0:20 Why Merge Conflicts Happen
1:45 How to Resolve Merge Conflicts using the Command Line
6:20 Resolve Merge Conflicts with VS Code
7:10 Merge Conflicts Cheat Sheet

MY TECH

MUSIC
Music from Uppbeat (free for Creators!):
License code: APXH7KJUQMMHJF3Q

ICON CREDITS
Boxer icons created by Freepik - Flaticon

#git #merge #learngit #mergeconflicts #github #gitmerge #gitrebase #development #softwareengineering #programming #coding #versioncontrol #developer #technology #tutorial #stepbystepguide #gitrepository #vcs #programmingtips #codersofinstagram #codingcommunity #learnprogramming #softwaredevelopment #codingtutorial #gitexplained

[kentakano]

BEST GIT tutorial ever !!!! more power to you and your channel !!!

[Guillen]

I always went for a GUI approach but after this video, either way is clear and easy. Thanks

[soadsam]

wow something that would stress me OUT at work was made so simple by you in less than 10 minutes. seriously appreciate it 🙏

[thiagaodavez]

I've been watching a lot of your Git videos recently and just wanted to say thank you! They are super useful, and the animations are beautiful. Keep up the great work! Greetings from Brazil!

[DJRanoia]

Dont forget a `git stash pop` to bring back your changes you stashed

[AkimboFennec]

I read the official pro git textbook, but did not understand what i should have done with the conflict. Then i searched for git merge conflict and found your YouTube channel. Thank you for this video. The only recommendation is to speak a little bit slower, to give us time to digest the information. Other than that I really loved the combination of an animated graph, which underpins the theory, and a practical conflict resolution using a manual process, or VScode. Again thank you. By the way i will checkout the website and purchase the git course.

[davidpaez_co]

This is honestly the best git course in all YouTube. Thank you so much!

[SwedeOfEnbound]

This is a world class example of how education should be; a very well produced video to support the subject! Take a look at it again how it interacts perfectly with the spoken words. But on the git merge topic, I have a lot of experience resolving conflicts but still wanted to further improve the particular skill and see what this video might give me - but while this vid was not for me this time I will definitely spread it to those who need it. And if you are one of those who do, you found the right video yourself now. Trust me.
Thanks. Keep it up! (Everyone!)

[JJSogaard]

This really makes Git much easier to understand. Fantastic animations. Thank you!

[fwostedfwakes]

Such a helpful channel! Easy to digest with the visuals and cli side by side. Shoutout to Odin Project for recommending me this channel.

[AK-vxdy]

You bought my by show how to abort merge right away 😳
Great job, nice level of knowledge for many, keep going.

[mostofmonty]

Nice video! Very clearly explained! This video helped me understand resolving merge conflicts 😊

[cpakkala]

Great series of videos; thanks.  There is one very important thing, however, that everyone tends to gloss over regarding conflicts, and this cannot be understated: just because a merge or rebase results in no conflicts does not mean the resulting code is correct!  Everyone who actually works in software development needs to be reminded of this constantly. You absolutely need to test your code after doing the merge/rebase (both testing of your new features as well as regression testing).   The merging algorithms are not intelligent programmers...   Furthermore, because you need to do this testing, it is always wisest to pull in changes from main to your branch and then test before merging or rebasing your branch back into main.

[porchmail]

Truly appreciate! This is one of the best IT tutorial videos that I’ve ever seen!

[eqzlmqk]

thank you so much. this has been the clearest explanation I`ve encountered. I have a test soon about this topic, and also need it currently for another school project :)) but solving the conflict on the terminal always seemed so intimidating

[elzabethtatcher]

Very informative. I always use my ide to to commits and pushes, because git is a pain if you only want to commit a portion of changes. IDE handles stashes in background.

[levaryazan]

Amazing! It always surprises me how good your videos are. I am a Java developer from Russia, with only a year and a half of experience. I took several courses on working with Git. But I still don't fully understand many nuances of the work. But your videos are very helpful to understand. I have no doubt that there is a lot of work behind the seeming simplicity. Because first to plan, and then to convey the meaning so clearly and simply - there is a huge strain and work behind it. Thank you for what you are doing! And sorry for my English))

[asishkumarmahapatra]

love to watch your videos always and a big thumbs-up as always

[jessephillips]

This was a great step one, you understood change A and change B and we're able to bring them together.

Any chance you could do a video on what to do when you don't understand change B? This ultimately gets into atomic commits and possibly the blame tool. Wish IDE's did their job and made this easier.

[naveedbhuiyan]

that was very helpful. Thanks a lot :D