Sync error

Operating system

Windows

Joplin version

3.3.12

Sync target

File system

Editor

Markdown Editor

What issue do you have?

There is a constant error poping out when I click the synchronize button.

The error message is Fetched items: 443/467.
Completed: 05/05/2025 11:22 (16s)
Last error: Error: On file 5192fc54d3c74b53a4dde8331edab91b.md: Invalid property format: ========: <<<<<<<< HEAD:5192fc54d3c74b53a4dde8331edab91b.md id: 5192fc54d3c74b53a4dde8331edab91b parent_id: item_type: 1 item_id: 090c7ec876a84dc3878ea485aca04459 item_updated_time: 1744964158290 title_diff: "" body_diff: "" metadata_diff: {"new":{"id":"090c7ec876a84dc3878ea485aca04459","parent_id":"17eae1547bdb4be8945f4185a636f447","latitude":"0.00000000","longitude":"0.00000000","altitude":"0.0000","author":"","s.

But after I delete the 5192fc54d3c74b53a4dde8331edab91b.md file there will be another md file with this error.
I have no idea what's going on here.
As a matter of fact, I used Dropbox for a while for synchronization. But I found it was useless as I found my new md file was not uploaded even when I click the Synchronize button. So I switch back to the file system for synchronization. But then the error is continuously seen when Synchronizing.

Can someone help me with this error? Thank u in advance.

Your data or part of it is corrupted by git markers (The <<<<<<<< HEAD at the top of your file). So you'll need to fix these conflicts first. And also you shouldn't put your data under a git repository otherwise that will happen again

thank u, I got it.