skills.rest
juliuss1907
juliuss1907COMMUNITY
Explore all skills by this author →
𝕏@juliuss1907GitHub

obsidian-git-no-conflict

Untrack machine-specific state files and symlink identity files to prevent Obsidian Git merge conflicts.

Updated Apr 15, 2026
Search Tags:#merge strategy#merge conflict resolution#Obsidian Git plugin#Git hygiene#multi-machine setup
One-click install
npx skills add https://github.com/juliuss1907/knowledge-base --skill obsidian-git-no-conflict
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: obsidian-git-no-conflict
Source: https://github.com/juliuss1907/knowledge-base/tree/main/.hermes/skills/devops/obsidian-git-no-conflict
Command: npx skills add https://github.com/juliuss1907/knowledge-base --skill obsidian-git-no-conflict

SYSTEM DOCUMENTATION & REQUIREMENTS

💡 This Skill includes scripts (resource) and references (resource) and assets (resource) components.

What problem does it solve?

This Skill unit addresses merge conflicts caused by the Obsidian Git plugin on multi-machine setups, such as VPS and main machines, where both run the plugin with auto-sync.

Core Features & Use Cases

  • Comprehensive .gitignore Setup: Provides a .gitignore configuration to exclude machine-specific state files from Git tracking.
  • Untracking Agent Runtime State: Ensures that agent runtime state files from both .hermes/ and .openclaw/ directories are untracked across machines.
  • Plugin Settings Optimization: Adjusts Obsidian Git plugin settings to prevent merge conflicts and enable automatic merge resolution.
  • Symlinking Identity Files: Creates symlinks for identity files to avoid conflicts without untracking them.
  • Verification Checklist: Offers a step-by-step verification process to confirm the fixes have been implemented correctly.

Quick Start

Run the 'obsidian-git-no-conflict' skill to apply the necessary fixes to prevent merge conflicts in Obsidian Git plugin setups.

Frequently Asked Questions about obsidian-git-no-conflict

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
Why does the Obsidian Git plugin constantly create merge conflicts in my multi-machine setup?▼

Merge conflicts in Obsidian Git multi-machine setups happen because machine-specific state files and agent runtime state directories are tracked by Git. Untracking these files and optimizing plugin settings eliminates sync conflicts.

How do I stop Git from tracking machine-specific state files in my Obsidian vault?▼

To stop tracking machine-specific state files, manually execute Git untracking commands and apply a comprehensive .gitignore configuration. This removes conflicting files from version control while keeping them locally.

What is the best merge conflict resolution strategy for Obsidian Git auto-sync?▼

The best merge conflict resolution strategy for Obsidian Git auto-sync involves optimizing plugin settings for automatic resolution, untracking runtime state files, and creating symlinks for identity files to prevent conflicts.

Can I use symlinks to fix identity file conflicts in Obsidian Git without untracking them?▼

Yes, you can create symlinks for identity files to avoid merge conflicts without untracking them. This keeps files in Git version control while redirecting content locally to prevent sync collisions across machines.

Does the Obsidian Git no conflict fix require manual Git commands?▼

Yes, the fix requires manual execution of Git commands for untracking machine-specific state files and creating identity file symlinks. A verification checklist confirms all manual steps are implemented correctly.

Related Skills

Explore More Software Engineering Skills→
usepowershellusepowershell
9

distributed-mesh

Generate mesh.json and install sync scripts for cross-machine squad state synchronization.

Community
Intermediate
nthpaulnthpaul

fix-merge-conflicts

Resolves git merge conflicts and validates builds with compile, lint, and tests.

Community
Intermediate
eavichayeavichay

git-setup-ignore

Configure .gitignore files to exclude Spec Kit cache and backup artifacts.

Community
Basic
ksciuskscius
2

fix-merge-conflicts

Resolve Git merge conflicts and verify buildable, test-passing state.

Community
Advanced