From 7cfdfcf4580497796ca07f3eebbf627873dbda1c Mon Sep 17 00:00:00 2001
From: ammarahm-ed <ammarahmed6506@gmail.com>
Date: Fri, 31 Dec 2021 11:05:42 +0500
Subject: [PATCH] fix merge conflict resolution

---
 .../src/components/MergeEditor/index.js       | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/mobile/src/components/MergeEditor/index.js b/apps/mobile/src/components/MergeEditor/index.js
index 81a73d21e..4cefbc91c 100644
--- a/apps/mobile/src/components/MergeEditor/index.js
+++ b/apps/mobile/src/components/MergeEditor/index.js
@@ -16,7 +16,6 @@ import Navigation from '../../services/Navigation';
 import Sync from '../../services/Sync';
 import {dHeight} from '../../utils';
 import {db} from '../../utils/database';
-import diff from '../../utils/differ';
 import {
   eApplyChanges,
   eShowMergeDialog,
@@ -131,16 +130,20 @@ const MergeEditor = () => {
         : null;
 
     await db.notes.add({
-      content: {
-        data: content.data,
-        type: content.type,
-        dateEdited: content.dateEdited,
-        remote: true,
-        dateResolved: secondaryData.dateEdited
-      },
       id: note.id,
+      conflicted: false,
+      dateEdited: content.dateEdited
+    });
+
+    await db.content.add({
+      id: note.contentId,
+      data: content.data,
+      type: content.type,
+      dateResolved: secondaryData.dateModified,
+      sessionId: Date.now(),
       conflicted: false
     });
+
     if (keepCopy) {
       await db.notes.add({
         content: {
@@ -220,7 +223,6 @@ const MergeEditor = () => {
   };
 
   const close = () => {
-
     db.fs.cancel(primaryData?.noteId);
 
     EV.unsubscribe(EVENTS.mediaAttachmentDownloaded, onMediaLoaded);
@@ -275,7 +277,7 @@ const MergeEditor = () => {
                 paragraph="Apply selected changes to note?"
                 padding={12}
               />
-              <Seperator/>
+              <Seperator />
               <DialogButtons
                 positiveTitle="Apply"
                 negativeTitle="Cancel"