wip diff modal

packages/app/src/components/PageEditor/ConflictDiffModal.tsx

@@ -0,0 +1,18 @@
+import React, { FC } from 'react';
+import {
+  Modal, ModalHeader, ModalBody,
+} from 'reactstrap';
+import { UnControlled as ReactCodeMirror } from 'react-codemirror2';
+
+export const ConflictDiffModal: FC = () => {
+  return (
+    <Modal isOpen toggle={} className="modal-gfm-cheatsheet">
+      <ModalHeader tag="h4" toggle={} className="bg-primary text-light">
+        <i className="icon-fw icon-question" />Markdown help
+      </ModalHeader>
+      <ModalBody>
+        <ReactCodeMirror />
+      </ModalBody>
+    </Modal>
+  );
+};

packages/app/src/components/PageEditor/Editor.jsx

@@ -18,6 +18,7 @@ import CodeMirrorEditor from './CodeMirrorEditor';
 import TextAreaEditor from './TextAreaEditor';
 
 import pasteHelper from './PasteHelper';
+import { ConflictDiffModal } from './ConflictDiffModal';
 
 class Editor extends AbstractEditor {
 
@@ -369,14 +370,7 @@ class Editor extends AbstractEditor {
           { this.renderCheatsheetModal() }
 
         </div>
-        <Modal isOpen toggle={} className="">
-          <ModalHeader tag="h4" toggle={} className="bg-primary text-light">
-            <i className="icon-fw icon-question" />Resolve conflict
-          </ModalHeader>
-          <ModalBody>
-            Test
-          </ModalBody>
-        </Modal>
+        <ConflictDiffModal />
       </>
     );
   }