ParentFull threadfourthark·It has a fantastic GUI three-way merge tool p4merge, which is available for free and works with git.View on HN