feat(desktop): merge external changes into unsaved edits like a pull

apps/desktop/src/components/note-save-alerts.tsx

@@ -1,6 +1,5 @@
 import type { ReactElement } from 'react'
 import { InlineAlert } from '@/components/inline-alert.tsx'
-import { NoteConflictBanner } from '@/components/note-conflict-banner.tsx'
 import type { AssetSaveError } from '@/editor/use-asset-persistence.ts'
 import type { NoteDocument } from '@/editor/use-note-document.ts'
 
@@ -10,7 +9,7 @@ interface NoteSaveAlertsProps {
   assetSaveError?: AssetSaveError | null
 }
 
-/** What went wrong saving a ready document, and the external-change conflict prompt. */
+/** What went wrong saving a ready document. */
 export function NoteSaveAlerts({
   document,
   assetSaveError = null,
@@ -29,9 +28,6 @@ export function NoteSaveAlerts({
           {assetSaveError.message}. It was not added to the note.
         </InlineAlert>
       ) : null}
-      {document.conflict !== null ? (
-        <NoteConflictBanner onKeepMine={document.keepMine} onLoadTheirs={document.loadTheirs} />
-      ) : null}
     </>
   )
 }

apps/desktop/src/editor/alias-placement.ts

@@ -16,8 +16,8 @@ import { openSession } from './open-documents.ts'
  * Placement routes through the live session whenever the note is open — in
  * the renaming pane or a *reopened* one (the open-documents service is the
  * one liveness signal). A direct disk write under a reopened dirty buffer
- * would park a conflict caused by our own background work, and "keep mine"
- * would silently drop the alias. Only when no session can take the patch
+ * would force a merge against our own background work. Only when no
+ * session can take the patch
  * does the alias go straight to disk; a loading/clean session reconciles it
  * like any external change, and a header-only patch is body-safe even for
  * protected notes.

apps/desktop/src/editor/document-binding.test.ts

@@ -27,12 +27,10 @@ function fakeSession(path: string) {
     editorChanged: () => {},
     externalChanged: () => {},
     flush,
-    keepMine: () => {},
     isDirty: () => false,
     isUnpersisted: () => false,
     prepareDelete: async () => false,
     cancelDelete: () => {},
-    loadTheirs: () => {},
     commitFrontmatter: async () => true,
     content: () => '',
     liveContent: () => '',

apps/desktop/src/editor/move-note.test.ts

@@ -31,12 +31,10 @@ function fakeSession(path: string) {
     editorChanged: () => {},
     externalChanged: () => {},
     flush,
-    keepMine: () => {},
     isDirty: () => false,
     isUnpersisted: () => false,
     prepareDelete: async () => false,
     cancelDelete: () => {},
-    loadTheirs: () => {},
     commitFrontmatter: async () => true,
     content: () => '',
     liveContent: () => '',