Key points of synchronization:

Synchronization is unidirectional: the main version is synchronized to the sub-version, and the content of the sub-version cannot be synchronized to the main version

Synchronization range: Text content (title does not participate in synchronization)

Synchronization granularity: Paragraph, you can roughly think of the content between two carriage returns is a paragraph

Note: If the main version and the sub-version are very different, or if both the main version and the sub-version need to modify the same paragraph frequently, it is recommended to create a new document in the sub-version, otherwise it will often conflict

Case 1: The major version is modified, but the minor version is unchanged

During synchronization, the system applies the latest changes (including new content, modified content, and deleted content) of the primary version to the sub-version

Case 2: The main version is not modified, but the sub-version is modified

The synchronization was successful, but no substance was synchronized

Case 3: The major version and the minor version are modified at the same time

1. Changes are made to different paragraphs:

   Automatically merge during synchronization, that is, the content of paragraphs modified by the main version is applied to the sub-version, and the modified parts of the sub-version are unchanged.

2. The same paragraph is modified:

   A conflict occurs because the system does not know which party is responsible for the modification of this paragraph, and it needs to be handled manually. The handling process is as follows:

   1. The interface will display the conflicting paragraph content, which may exist in multiple places

      Note: The system will list all paragraphs that differ from major versions and sub-versions as conflict points (regardless of whether the paragraph has previously resolved conflicts).

   2. Keep the desired content for each conflict (delete the unwanted ones), and then click "Mark as resolved" in the upper right corner of the conflict block to process one by one

   3. After all conflicts are handled, submit

3. Logic after conflict resolution:

   Assume that the subversion of paragraph A has resolved the conflict and is saved

   1. If the main version modifies the content of paragraphs except paragraph A, it is automatically merged (the content of paragraphs modified by the main version is synchronized to the sub-version, but paragraph A is not synchronized).

   2. The main version modified paragraph A, resulting in a conflict, need to resolve the conflict after submission