public/obsidian-livesync
1
0
Fork 0
mirror of https://github.com/vrtmrz/obsidian-livesync.git synced 2025-12-20 05:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed:

Browse Source 
- Resolving conflicted revision has become more robust.
- LiveSync now try to keep local changes when fetching from the rebuilt remote database.
- Now, all files will be restored after performing `fetch` immediately.
This commit is contained in:
vorotamoroz
2023-09-05 09:16:11 +01:00
parent 10decb7909
commit b8cb94c498
5 changed files with 62 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/utils.ts
View File

@@ -477,7 +477,7 @@ export const requestToCouchDB = async (baseUri: string, username: string, passwo
export async function performRebuildDB(plugin: ObsidianLiveSyncPlugin, method: "localOnly" | "remoteOnly" | "rebuildBothByThisDevice") {
if (method == "localOnly") {
await plugin.addOnSetup.fetchLocal();
await plugin.addOnSetup.fetchLocalWithKeepLocal();
}
if (method == "remoteOnly") {
await plugin.addOnSetup.rebuildRemote();