A fully open source & end-to-end encrypted note taking alternative to Evernote.
TypeScript asp-net-coredotnet-coreelectronfosshacktoberfestnote-managmentnote-takingnote-taking-appnotebooknotesnotes-appopen-sourceopensourceprivacyproductivityreactreact-nativereactjsself-hosted
Create merge-conflicts.md
Muhammad Ali5cd37f4b64f5
diff --git a/docs/help/contents/merge-conflicts.md b/docs/help/contents/merge-conflicts.mdnew file mode 100644index 000000000..cebccb3e3--- /dev/null+++ b/docs/help/contents/merge-conflicts.md@@ -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.++++