3-way conflict visualisation is excellent. It allows you the original parent as well as the current and incoming. Saves so much faff figuring out how to resolve

3-way conflict visualisation is excellent. It allows you the original parent as well as the current and incoming. Saves so much faff figuring out how to resolve a conflict. https://medium.com/@karol.rossa/git-3-way-merge-addc2728c300 https://medium.com/@karol.rossa/git-3-way-merge-addc2728c300