A 3 way merge consists in have 3 versions of a file, hopefully with minor differences: one ancestor and two children.
I'm working on a project where I have a commit that introduced a feature with major problems that weren't discovered …
mercurial merge dvcs 3-way-mergeMy boss set up our new Git repository, one on our Windows server and one on our Linux Server. I …
git repository meld 3-way-merge