Conflict Resolution

A conflict may arise during synchronization or branch merging — this means that someone has changed the same place in the article that you have changed locally. Both versions are kept: yours in the catalog, the other one in the repository. The conflict is resolved right in the article: you see both versions and choose which one to keep.

Resolve a conflict

  1. In the conflict dialog, click Resolve the conflict. The publishing panel opens: at the top, the Conflicts row shows their number, and the list shows files with conflicts.

  2. Open an article with a conflict. Conflicting places are marked in the article margin.

  3. Hover over a mark — a window opens with the incoming version, its author, and the date.

  4. Choose what to keep:

    • Keep mine — your version.

    • Keep both — both versions, yours and the incoming one.

    • Take incoming — the version from the repository.

    You can change your choice: open the window again and click another button.

  5. Resolve all conflicts this way and publish the changes. While the catalog has unresolved conflicts, publishing is unavailable.

To resolve all conflicts in the catalog at once, click in the Conflicts row and choose Keep my version in all conflicts or Take repository version in all conflicts.

Special cases
  • An article is deleted on one side. If the article was deleted by you or in the repository, in the conflict window you can keep it or choose Delete the article.

  • Images and other files. For a file that is not an article, choose Take my version or Take the repository version.

Cancel synchronization or merge

If you do not need to resolve the conflict now, choose Cancel synchronization or Cancel merge in the conflict dialog. The catalog returns to the state before synchronization, and the branches are not merged.