問題：
As it currently stands, this question is not a good fit for our Q&A format.
就目前而言，這個問題不適合我們的問答形式。
We expect answers to be supported by facts, references, or expertise, but this question will likely solicit debate, arguments, polling, or extended discussion.
我們希望答案得到事實、參考或專業知識的支持，但這個問題可能會引起辯論、爭論、投票或擴展討論。
If you feel that this question can be improved and possibly reopened, visit the help center for guidance.
如果您認爲此問題可以改進並可能重新打開，請訪問幫助中心以獲取指導。
Closed 8 years ago .
8 年前關閉。
Subversion, Git, Mercurial and others support three-way merges (combining mine, theirs, and the "base" revision) and support graphical tools to resolve conflicts. Subversion、Git、Mercurial 和其他支持三向合併（結合我的、他們的和“基本”修訂版）並支持圖形工具來解決衝突。
What tool do you use?你用什麼工具？ Windows, Mac OS X, Linux, free or commercial, you name it. Windows、Mac OS X、Linux，免費的或商業的，任你說。
Here's a few that I've used or heard of, just to get the conversation started:以下是我使用過或聽說過的一些，只是爲了開始對話：
(I recognize that this is sort of like the Best Diff Tool , but it's different in that I explicitly focus on three-way merge tools; WinMerge is off the list, for example.) （我意識到這有點像Best Diff Tool ，但不同之處在於我明確關注三向合併工具；例如， WinMerge不在列表中。）
解決方案：
參考一： https://stackoom.com/question/2Ord參考二： What's the best three-way merge tool? [closed]