Git Internals - Git Merge (merge & rebase series - part 2)

Merging is the process of combining the recent changes from several branches into a single new commit that will be on all of those branches. This is part 2 of a series about Merge & Rebase. In Part 1 we covered Diffs and Patches. The next parts will cover merge conflicts and rebase. ====================== `git lol` alias: https://gist.github.com/Omerr/8134a61... ====================== 📕 My book "Gitting Things Done" is officially out! Get it on Amazon: https://www.amazon.com/dp/B0CQXTJ5V5 As an eBook: https://www.buymeacoffee.com/omerr/e/... Or read it for free at: https://www.freecodecamp.org/news/git... ====================== ====================== 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 :) https://www.buymeacoffee.com/omerr 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: https://www.awin1.com/cread.php?awinm... I edit using Descript: https://www.descript.com/?lmref=Ux4_CA Creating video thumbnails: https://snappa.com/?afmc=3uh Microphone: Yeti Blue: https://amzn.to/3QydgtP Drawing: Wacom Intuos: https://amzn.to/3pyRXwh ====================== Video created by Omer Rosenbaum. All rights reserved.