Mirrors/notesnook
1
0
Fork 0
mirror of https://github.com/streetwriters/notesnook.git synced 2025-12-16 19:57:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Create merge-conflicts.md

Browse Source 
Signed-off-by: Muhammad Ali <alihamuh@gmail.com>
This commit is contained in:
Muhammad Ali
2024-08-20 14:53:51 +05:00
committed by GitHub
parent 25675f71e8
commit 5cd37f4b64
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docs/help/contents/merge-conflicts.md Normal file
View File

@@ -0,0 +1,9 @@
# Merge Conflicts
Merge conflicts occur when there are conflicting note edits on your devices for the same note.
Lets suppose that you have two devices running Notesnook: 1. a desktop and 2. a mobile. Suppose that one of your devices is offline (in this case your mobile phone). Now if you make edits to the same note on both your devices and then synched them both a merge conflict will occur.