在執行 send/receive 之後，其中一位譯者已經對部分詩篇進行了一些工作，結果我發現有兩章出現了合併衝突，並顯示以下錯誤：
由於某些節號無效，無法合併對該章所做的更改。
紅色/綠色高亮顯示對應於舊版/新版文字
Paratext 拒絕的更改：
然後內容完全空白。我分別以標準檢視（Standard）和無格式檢視（Unformatted）檢視了這兩章，但看不到任何被標記的錯誤。
我還能看到 send/receive 報告顯示他在某一天對其中一章的 13 節做了更改，另一天改了 12 節，還有一天改了 8 節，但並沒有顯示任何更改。這些更改可以追溯到幾個月前，因為他當時正在學習使用新電腦，同時也在舊電腦上工作，這些更改反映了他在該期間的草稿進度。
節歷史（verse history）可以成功顯示我草稿的進度，以及我後續在格式、標點和拼寫上的工作，但我沒有看到任何節號問題。
我在詩篇上做的一件重要事情是移除了 \cl 行，這些行是幾年前建立該書時從 NIV 複製標記時繼承下來的。我不確定這是否相關，但為了完整性我在此提及。
那麼，有沒有辦法讓我找出是哪些更改導致了這個衝突訊息？
Having done a send/receive after one of the translators has done some work on some Psalms, I get two chapters where I get a merge conflict which has the following error:
Changes made to a chapter could not be merged because some verse numbers were invalid.
Red/Green Highlight corresponds to Older/Newer text
The changes that Paratext REJECTED:
And then it’s completely empty. I looked at both chapters in both Standard and Unformatted views, and cannot see any errors flagged.
I can also see that the send/receive report says that he made changes to one of the chapters in 13 verses on one day, 12 verses another, and 8 on another day, but no changes appear. These changes go back months, as he was learning his new computer while working on his old computer, and reflect his drafting over that time.
The verse history can successfully show me the progress of the drafting, and then my work with formatting, punctuation and spelling, but I see no problems with verse numbers.
One significant thing I did with Psalms was to remove the \cl lines which we had inherited when copying the markers from NIV on creating the book a few years ago. I don’t know that this is related, but I mention it for completeness.
So, is there a way that I can work out what changes have been made that are causing the conflict message?
機器翻譯自 English
