Advanced Merges (3-way merge, conflicts) (merge & rebase series - part 2)

Description:

In this video we understand the 3-way merge algorithm, and how Git deals with merge conflicts. This is part 3 of a series about Merge & Rebase. In Part 1 we covered Diffs and Patches. In Part 2 we covered the basics of Merge. The next part will cover rebase. ====================== 📕 My book "Gitting Things Done" is officially out! Get it on Amazon: As an eBook: Or read it for free at: ====================== `git lol` alias: git-graph (my alias is `gg`): ====================== I've got a feeling / a day in the life process: ====================== Additional resources about Merge: ====================== I am working on a book about Git! Are you interested in reading the initial versions and providing feedback? Send me an email: [email protected] ====================== ====================== Support this channel: My mission is to create free, accessible, visual and practical tutorials. If you would like to support me on this, you can buy me a coffee :) Thank you!! ====================== ====================== How do I make videos? I often get questions about the tools I use to create Videos - so here they are :) (When available, I may use affiliate links and may earn a commission, with NO additional cost to you) To create the hand-drawn animations, I use VideoScribe: I edit using Descript: Creating video thumbnails: Microphone: Yeti Blue: Drawing: Wacom Intuos: ====================== Video created by Omer Rosenbaum. All rights reserved.