当我们的项目处理圣经模块时，我们在 XXC 书中频繁遇到合并冲突。但这些“冲突”实际上是与原始位置的编辑相关的问题。有时这与原始引用位置的冲突相对应，但其他时候，它似乎仅仅是由于特定用户何时打开其 XXC 书并因此刷新了其中的文本所致。
首先，据我理解，规范本身位于 XYZ\Modules\ 文件夹中，而该特定的 *.sfm 文件仅包含 \ref 行以及任何其他手动输入的内容。然后，XYZ\96XXCXYZ.SFM 文件包含引用导入之后的 usfm 结果。这两个假设都正确吗？
如果是这样，那么为什么 S/R 要尝试合并 96XXCXYZ.SFM 文件呢？尝试合并原始的 XYZ\Modules\original.sfm 文件和所有不同的圣经书卷不是更好吗？顺便问一下，如果在合并 XYZ\Modules\original.sfm 时存在冲突，何时会向用户报告？
[[请注意，我个人认为 XYZ\96XXCXYZ.SFM 不应被合并这一观点有一个复杂之处……当 XXC 书与圣经模块关联时，这是正确的。但当该书是独立创建的（不包含模块式标记，如 \ref）时，仍然需要进行正常的合并。]]
我正在考虑撰写一份错误报告/功能请求，但我也在 wondering 是否有关于系统的某些方面是我 simply 没有理解的。
As our project works on a Bible Module, we’re frequently getting merge conflicts in the XXC book. But the “conflicts” are really problems associated with edits in the original location. Sometimes this parallels a conflict in the original reference location, but other times it seems to simply be a function of when a particular user opened his XXC book and as a result refreshed the text inside of it.
First, my understanding is that the specification itself lives inside the folder XYZ\Modules\ folder, and that that particular *.sfm file only includes the \ref lines and anything else that’s been manually entered. Then the XYZ\96XXCXYZ.SFM files contains the usfm results after the references have been imported. Are both those assumptions correct?
If so, then why is S/R trying to merge the 96XXCXYZ.SFM file at all? Wouldn’t it be better off trying to merge the original XYZ\Modules\original.sfm file and all the different Biblical books? For that matter, if there are conflicts when merging XYZ\Modules\original.sfm, when would that get reported to the users?
[[Note that there is one complication in my personal belief that XYZ\96XXCXYZ.SFM ought not be merged… that’s true when the XXC book is associated with a Bible Module. But when the book is created all on it’s own (and doesn’t include the module-style markup like \ref), then normal merging would still need to happen.]]
I’m considering writing up a bug report/feature request, but I’m also wondering if there’s something about the system that I’m simply not understanding.
机器翻译自 English
