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

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

Download information and video details for Advanced Merges (3-way merge, conflicts) (merge & rebase series - part 2)

Uploader:

Brief

Published at:

4/24/2023

Views:

3.5K

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.