Conflict Resolution

Conflicts may arise during synchronization or branch merging if someone has modified the same line that you have also changed locally.

1. Click Resolve Conflict to open a window displaying both incoming and local changes.

2. Resolve the conflict by selecting one of the versions or editing the text directly in the conflict resolution window.

3. Click Confirm — the file will be saved locally, and when published to storage, this version will be considered the latest.

This process ensures a smooth workflow by allowing you to handle conflicts efficiently and maintain an accurate version history.