From 484648e9f088b70aeddfa30e476e9d04c0e58d69 Mon Sep 17 00:00:00 2001
From: Zane Meyers <zanemeyers@gmail.com>
Date: Wed, 27 May 2026 20:08:22 -0400
Subject: [PATCH] vault backup: 2026-05-27 20:08:22

---
 .obsidian/plugins/obsidian-git/data.json | 4 ++--
 timestamped/2026-01-20_10-10-00.md       | 2 +-
 timestamped/2026-03-05_10-26-48.md       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.obsidian/plugins/obsidian-git/data.json b/.obsidian/plugins/obsidian-git/data.json
index a8a8441..4c66b8d 100644
--- a/.obsidian/plugins/obsidian-git/data.json
+++ b/.obsidian/plugins/obsidian-git/data.json
@@ -16,8 +16,8 @@
   "listChangedFilesInMessageBody": false,
   "showStatusBar": true,
   "updateSubmodules": false,
-  "syncMethod": "merge",
-  "mergeStrategy": "none",
+  "syncMethod": "rebase",
+  "mergeStrategy": "ours",
   "customMessageOnAutoBackup": false,
   "autoBackupAfterFileChange": false,
   "treeStructure": false,
diff --git a/timestamped/2026-01-20_10-10-00.md b/timestamped/2026-01-20_10-10-00.md
index 424e6ad..bc76940 100644
--- a/timestamped/2026-01-20_10-10-00.md
+++ b/timestamped/2026-01-20_10-10-00.md
@@ -12,5 +12,5 @@ I added a [[small-tasks|task]] for it.
 [html-calculators](https://github.com/ZaneMeyers/html-calculators)
 
 I'm now certain that common estimating calculators
-(e.g. voltage drop)
+(e.g. [[voltage-drop]])
 could be easily replaced with documents like this one.
diff --git a/timestamped/2026-03-05_10-26-48.md b/timestamped/2026-03-05_10-26-48.md
index ca665e4..560cbbc 100644
--- a/timestamped/2026-03-05_10-26-48.md
+++ b/timestamped/2026-03-05_10-26-48.md
@@ -10,7 +10,7 @@ daily: "[[2026-03-05]]"
 
 ## Python SQLite Voltage Drop Calculator
 
-Python script to account for voltage drop
+Python script to account for [[voltage-drop]]
 based on various factors given in various forms
 
 Python to handle calculation, defaults.