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

Descrizione:

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.