Comments (4)
OK you have delete the original, this is why you geht this error.
The error message should be adapted-
from plugin-conflict-resolution.
Hej, thank you for the timely reply. Got to answer only now, apologies.
I am not sure I'm following: should I "delete" or "delete not"? And "the original" refers to the local or remote version of the file?
from plugin-conflict-resolution.
Oh a typo on the hurry ...
You should not delete the notes until the conflict is resolved. The plugin can no longer compare the version in the conflict folder with the original.
from plugin-conflict-resolution.
This seems to be fixed in Joplin 2.14.11 (Linux/build from commit 582f0853bb4a7e389daec03bce1682d910da267b).
from plugin-conflict-resolution.
Related Issues (11)
- Investigate escaping note contents. HOT 1
- Diff window doesn't react to Joplin width.
- Add a move title contents button. HOT 2
- Diff editor doesn't use Joplin color Theme. HOT 1
- Resolve Conflict button always enabled
- setFitToContent does not exist (Incompatible Joplin version)
- Is it possible to check conflicts/diff in any folder? HOT 10
- Resolve window not coming up HOT 4
- Context Menu Entry not showing HOT 4
- Suggestion: add `joplin-plugin` topic to the repo
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google ❤️ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.
from plugin-conflict-resolution.