PART 3 of my Git Tutorial Series... (More videos to come in the future) This is the THIRD video in a series of videos on Git, the second video can be found here: https://www.youtube.com/watch?v=aYYG1IlZRN8 And the Playlist itself is here: https://www.youtube.com/watch?v=58zsLtwzL60 In this particular video (Part 3) I explain one of the most feared and perceived difficult components of Git, however an incredibly important one that everyone that uses Git has to contend with, thats merging. The ability to 'bring back' 2 separate branches of code back into one branch, keeping all of the changes from both branches and literally MERGING their contents together. This is particularly important when combined with the idea of branching overall. The idea of creating separated, safe and isolated areas to code new features, bug fixes or experimental code in. However once you are happy with said code, you probably want to import it into your main code base (you main branch, master maybe?) and that is where git merge comes in... Git is INCREDIBLY clever when it comes to merging 2 branches of code and in most cases can simply carry out the action and your done with nothing but a simple command. However sometimes when the developers in the different branches have both changed the same line/s of code and git tries to merge both changes in, it doesn't know which is the correct version or at least the version that it should keep between the 2 variations, this is called a CONFLICT and the process of merging is scary to most developers because of conflicts and having to resolve them. Resolving conflicts requires user intervention and in this video I showcase 3 different simple ways of dealing with your conflicts, so that you can be super confident and enter that merge command ready for what git throws at you. Of course I also show you how to abort the merge if conflicts pop and you don't want to deal with them then and there... The only new command I show you in this video is: git merge and of course the variation that allows you to abort... git merge --abort Below are all the links from the video... Visual explanation of merging from Stackoverflow question... https://stackoverflow.com/questions/55730292/how-git-maintains-commits-from-deleted-branch Fully detailed explanation of the git merge command (Git-scm)... https://git-scm.com/docs/git-merge Gist that explains how to fully use git mergetool (VimDiff)... https://gist.github.com/karenyyng/f19ff75c60f18b4b8149 Please stay tuned to the channel and keep an eye out for the next videos in the series... Link to find git downloads and install... https://git-scm.com/downloads Some more awesome links to help you on your git journey... https://rogerdudler.github.io/git-guide/ https://learngitbranching.js.org/ http://git-school.github.io/visualizing-git/ https://guides.github.com/introduction/git-handbook/ Please reach out to me with ANY questions at all and THANKS for watching, please let me know if there is any other topics that you would like me to cover as I start to slowly add more content to this channel... Twitter: https://twitter.com/ben_kadel Github: https://github.com/kardelio ------------------------------------- Tools: ------------------------------------- Video Editing: https://www.blackmagicdesign.com/products/davinciresolve/ Image Editing: https://www.gimp.org/ Camera: Canon M50 ------------------------------------- Credits: ------------------------------------- Intro Card Music: https://www.purple-planet.com/ Music: https://www.bensound.com/ In Video Background: Photo by Adrien Olichon from Pexels Thumbnail Background: Pexels.com (No Attribution Required) Vid: 17 #git #tutorial #terminal