Marcus Summers
ef91865f88
5 files had stale unmerged index entries from a prior aborted merge — working tree was already clean (no conflict markers), differences were purely `updated:` field timestamps that drifted across machines via Obsidian Sync. Working-tree timestamps (most recent) are kept as the resolution. Sixth file (mastodon-instance-tuning.md) preserves staged S3 cache management content that a working-tree revert would have lost. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> |
||
|---|---|---|
| .. | ||
| ssh-config-key-management.md | ||