kenji/omarchy-stow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vdirsyncer: conflict resolution added

Browse Source
This commit is contained in:
kenji
2025-12-01 20:53:48 -06:00
parent d9d7a98457
commit 64cae7dff1
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
caldav/.config/vdirsyncer/config
+3
View File
@@ -8,6 +8,7 @@ a = "my_calendar_local"
b = "my_calendar_remote" b = "my_calendar_remote"
collections = ["from a", "from b"] collections = ["from a", "from b"]
metadata = ["displayname", "color"] metadata = ["displayname", "color"]
conflict_resolution = "b wins"
# --- LOCAL STORAGE --- # --- LOCAL STORAGE ---
# Where the calendar files will sit on your Linux machine # Where the calendar files will sit on your Linux machine
@@ -30,6 +31,7 @@ password.fetch = ["shell", "cat ~/Dotfiles/.secrets/vdirsyncer_secret"]
a = "school_sched_local" a = "school_sched_local"
b = "school_sched_remote" b = "school_sched_remote"
collections = null collections = null
conflict_resolution = "b wins"
# collections = ["from a", "from b"] # collections = ["from a", "from b"]
[storage school_sched_local] [storage school_sched_local]
@@ -49,6 +51,7 @@ a = "school_task_local"
b = "school_task_remote" b = "school_task_remote"
collections = null collections = null
# collections = ["from a", "from b"] # collections = ["from a", "from b"]
conflict_resolution = "b wins"
[storage school_task_local] [storage school_task_local]
type = "filesystem" type = "filesystem"