在一名译员对部分诗篇进行了一些工作之后，我执行了发送/接收（send/receive）操作，结果有两个章节出现了合并冲突，并显示以下错误：
由于某些节号无效，无法合并对章节所做的更改。
红色/绿色高亮分别对应旧文本/新文本
Paratext 拒绝的更改：
然后内容完全是空的。我在标准视图和未格式化视图中都查看了这两个章节，但没有看到任何标记的错误。
我还可以看到，发送/接收报告显示他在某一天对其中一个章节的 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
