Be the first to like this
A lot of developers avoid merging like the plague. Most common source control tools only support two-way merges out of the box. Many mistakes occur through bad merges (goto fail, maybe?). Correlation? Causation? We can fix that! Let's configure git to use a free, commercial-grade three-way merge tool and see how fun and fearless merging can be.