當我們的專案處理聖經模組時，我們經常在 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 是否系統中有什麼是我單純沒有理解的地方。
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 顯示原文
