In the 'After Merge' part of the 'Three-Way Merge' pic in your article, shouldn't C2 and C4 be swapped?
C4 would be the new commit that master points to after merging/combining the C2 and C3 branch. Yet it shows C2 as the latest commit after the merge.
We're a place where coders share, stay up-to-date and grow their careers.
We strive for transparency and don't collect excess data.