joplin / joplin/plugin-conflict-resolution

Cannot solve conflict on empty notes

Open
#24 0 comments 0 reactions 0 assignees View on GitHub
Dominant language
TypeScript
Stars
32
Forks
4
PR merge metrics
No merged PRs in 30d

Description

First of all, thank you for the AWESOME plugin.

Some conflicts have been popping on empty notes (notes that have just the note title).

When I try to use the plugin, nothing happens (I think is because, since the notes are empty, they do not have any diff).

My current workaround is just to insert a space in the note body so I can resolve the conflict.

Maybe one thing that could solve is to keep the note with the most recent timestamp, all else being equal.

I'm having the problem on Windows and on Linux.

Joplin info:
```
Joplin 3.3.13 (prod, linux)

Device: linux, Intel(R) Core(TM) i5-7300HQ CPU @ 2.50GHz
Client ID: 864c176e190844a193b82a41a8678ed8
Sync Version: 3
Profile Version: 47
Keychain Supported: No
Alternative instance ID: -

Revision: 144ed59

Backup: 1.4.3
Bidirectional Links: 0.2.1
Combine notes: 1.2.2
Conflict Resolution: 1.2.3
Extra Markdown editor settings: 1.11.0
Freehand Drawing: 3.0.1
Inline Tag Navigator: 2.5.8
Insert YouTube Video: 1.3.0
Markdown table calculations: 1.0.5
Markdown Table: Colorize: 1.2.0
Markdown Table: Sortable: 1.3.0
Markmap: 1.7.0
Menu items, Shortcuts, Toolbar icons: 1.1.0
MultiMarkdown Table Tools: 1.2.1
Note Tabs: 1.4.0
Publish to Web: 1.2.0
Rich Markdown: 0.16.2
Save Note as Markdown and Commit to Git: 1.0.5
Time Slip: 1.1.0
TimeWise Counter: 1.0.2
YesYouKan: 1.0.19

```

Contributor guide

No contributing guide indexed for this repository

Assessment

This issue has not been assessed yet.

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.