notesnook/docs/help/contents/merge-conflicts.md

title, description

title	description
Merge Conflicts	Merge conflicts occur when there are conflicting note edits on different devices for the same note.

Merge Conflicts

Why Merge Conflicts occur?

Merge conflicts occur when there are conflicting note edits on different devices for the same note.

How Merge Conflicts occur?

Lets suppose that you have two devices running Notesnook:

1. A desktop
2. A mobile device

Suppose that one of your devices is offline. Now if you made edits to one of your (same)notes on both your devices and synched changes a merge conflict will occur.

info

In order for a merge conflict to occur the changes on the (same)note on both devices should occur in more than a minute

Where do Merge conflicts show

The conflicted notes appear at the very top of the notes list. Just navigate to the Notes page and you will see them right away (If there are any).

How to Resolve Merge Conflicts

Desktop/Web

Follow these steps to resolve a Merge Conflict:

1. Go to the conflicted note. It appears at the top of your note list.
2. Open the note. This will take you to a conflict resolution screen.
3. On the conflict resolution screen two versions of your note will appear side by side. One will be from the device you are using (Current Note) and one will be from the server(Incomming Note).

4. Go through both versions and choose which one you want to keep.
5. Press the Keep button on the note you want to keep.
6. Press Discard button on the note you don't want to keep (you can also press the Save a Copy button if you want to keep it too).

Mobile

Follow these steps to resolve a Merge Conflict:

1. Go to the conflicted note. It appears at the top of your note list.
2. Open the note. This will take you to a conflict resolution screen.
3. On the Coflict Resolution Screen 2 versions of your note will appear above and below. One will be from the device you are using (Current Note) and one will be from the server(Incomming Note).

4. Go through both versions and choose which one you want to keep.
5. Press the Keep button on the note you want to keep.
6. And Discard button on the note you don't want to keep (you can also press the Save a Copy button if you want to keep it too).

---