From f5163f32d8a4bc993d80fb8bdab08645481ef447 Mon Sep 17 00:00:00 2001 From: Muhammad Ali Date: Thu, 22 Aug 2024 14:37:14 +0500 Subject: [PATCH] Update merge-conflicts.md Signed-off-by: Muhammad Ali --- docs/help/contents/merge-conflicts.md | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/docs/help/contents/merge-conflicts.md b/docs/help/contents/merge-conflicts.md index 8b141c64b..c987ce4b6 100644 --- a/docs/help/contents/merge-conflicts.md +++ b/docs/help/contents/merge-conflicts.md @@ -26,10 +26,13 @@ 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). + ![](https://github.com/user-attachments/assets/7790bcd3-e87f-4a5e-a8e6-3fba1b3f3ab3) -5. Go through both versions and choose which one you want to keep. -6. Press the Keep button on the note you want to keep. -7. 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). + +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). + ![](https://github.com/user-attachments/assets/58558f0e-6bf1-486d-a183-702dba54dcaf) # [Mobile](#/tab/mobile) @@ -38,10 +41,13 @@ 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). + drawing -5. Go through both versions and choose which one you want to keep. -6. Press the Keep button on the note you want to keep. -7. 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). + +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). + drawing ---