We don’t allow questions seeking recommendations for software libraries, tutorials, tools, books, or other off-site resources. You can edit the question so it can be answered with facts and citations.
Closed 10 months ago.
由于您还没有绑定你的真实邮箱,如果其他用户或者作者回复了您的评论,将不能在第一时间通知您!
接受
或继续使用网站,即表示您同意使用 Cookies 和您的相关数据。
发布评论
评论(4)
不完全是三向合并,但 Google 的"Diff Match 和 Patch 库提供了强大的算法执行同步纯文本所需的操作”。该实现可用于 Java、JavaScript、C++、C#、Lua 和 Python。
Not exactly three-way merge, but Google's "Diff Match and Patch libraries offer robust algorithms to perform the operations required for synchronizing plain text". And the implementation is available in Java, JavaScript, C++, C#, Lua and Python.
Synchrotron 看起来不错。例如,请参阅三向合并和冲突处理的演示< /a>.
Synchrotron looks good. E.g. see the demo of three-way merge and conflict-handling.
刚刚完成了这样一个 js 和 php 工具的工作。看看并享受:
https://github.com/Krassmus/Textmerger
你只需要 编写
用 PHP
或即可完成。
Just finished my work on such a js- and php-tool. Have a look and enjoy:
https://github.com/Krassmus/Textmerger
You'd just need to write
or in PHP
and you're done.
在发现 npm 包 3-way-merge 和 Three-way-merge(出现在“三向合并 npm”搜索结果中的主要包)运行不佳且未得到维护后,我偶然发现了这个更大更有帮助
https://www.npmjs.com/package/diff3
我们最终像这样编写我们的解决方案:
After finding that the npm packages 3-way-merge and three-way-merge (the main ones that show up in search results for "three way merge npm") didn't work well, and are not maintained, I stumbled upon this much larger more helpful
https://www.npmjs.com/package/diff3
We ended up writing our solution like so: