andras/reconcile
1
0
Fork 0
Code Issues Pull requests 5 Projects Releases Packages Wiki Activity Actions

Enable merging

Browse source
This commit is contained in:
Andras Schmelczer 2025-01-12 11:36:45 +00:00
parent eee78fd1a7
commit b61c08041e
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugin/src/file-operations/obsidian-file-operations.ts
View file

@ -69,7 +69,7 @@ export class ObsidianFileOperations implements FileOperations {
return new Uint8Array(0);
}
if (isFileTypeMergable(path)) {
if (!isFileTypeMergable(path)) {
Logger.getInstance().debug(
`The expected content is not mergable, so we won't perform a 3-way merge, just overwrite it`
);