Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2026-09-01 19:49:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update merge-conflicts.md

Browse Source 
Signed-off-by: Muhammad Ali <alihamuh@gmail.com>
This commit is contained in:
Muhammad Ali
2024-08-22 14:37:14 +05:00
committed by GitHub
parent 93628129a4
commit f5163f32d8
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
docs/help/contents/merge-conflicts.md
View File

@@ -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).
<img src="https://github.com/user-attachments/assets/616381b6-17dc-4d2b-98a7-e7f2629f1925" alt="drawing" width="414" style="text-align:center"/>
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).
<img src="https://github.com/user-attachments/assets/699454f9-7840-4955-9c5f-1efd8c7963ea" alt="drawing" width="414"/>
---