如何将文本合并在一起？就像版本控制系统一样？

发布于 2024-12-15 00:20:53 字数 366 浏览 2 评论 0原文

维基百科说这非常好： http://en.wikipedia.org/wiki /Merge_(revision_control)#Three-way_merge

但是如何实现这一点呢？或者是否有 Ruby on Rails 的 gem/插件可以帮我处理这个问题？

我的情况：
• 我有基础文本
• A 的改变
• B 的变更
• 这两项更改都应包含在内，并且不覆盖其他

我可以指出的任何方向？谢谢！

原文

分享到QQ

分享到微博

如果你对这篇内容有疑问，欢迎到本站社区发帖提问参与讨论，获取更多帮助，或者扫码二维码加入 Web 技术交流群。

发布评论

需要登录才能够评论，你可以免费注册一个本站的账号。

情绪 2024-12-22 00:20:53

我认为你应该再次看看 merge3 gem [来源]。

这个小例子解释了它：

require 'rubygems'
require 'merge3'

start = <<TEXT
This is the baseline.
The start.
The end.
TEXT
changed_A = <<TEXT
This is the baseline.
The start (changed by A).
The end.
TEXT
changed_B = <<TEXT
This is the baseline.
The start.
B added this line.
The end.
TEXT

result = Merge3::three_way(start, changed_A, changed_B)

puts result

它生成的输出是：

This is the baseline.
The start (changed by A).
B added this line.
The end.

我不确定它如何处理合并冲突，并且由于它应该处理文件的 3 路合并，因此它似乎是基于行的。如果这是一个问题（因为您的示例尝试比较简单的字符串），您可以在每个字符之间添加换行符。

希望这有帮助。

I think you should look at the merge3 gem again [source].

This small example explains it:

require 'rubygems'
require 'merge3'

start = <<TEXT
This is the baseline.
The start.
The end.
TEXT
changed_A = <<TEXT
This is the baseline.
The start (changed by A).
The end.
TEXT
changed_B = <<TEXT
This is the baseline.
The start.
B added this line.
The end.
TEXT

result = Merge3::three_way(start, changed_A, changed_B)

puts result

The output it generates is:

This is the baseline.
The start (changed by A).
B added this line.
The end.

I am not sure how it handles merge conflicts, and since it is supposed to handle 3-way merges of files, it seems to be line-based. If that is a problem (as your example tries to compare simple string), you could add a newline between every character.

Hope this helps.

回复收藏 0 原文