Skills
.Work. You
Rest

obsidian-git-no-conflict

Community

Permanently eliminate merge conflicts in Obsidian Git plugin setups.

Software Engineering#merge strategy#merge conflict resolution#Obsidian Git plugin#Git hygiene#multi-machine setup
Authorjuliuss1907
Version1.0.0
Installs0

System Documentation

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.

Dependency Matrix

Required Modules

None required

Components

scriptsreferencesassets

💻 Claude Code Installation

Recommended: Let Claude install automatically. Simply copy and paste the text below to Claude Code.

Please help me install this Skill:
Name: obsidian-git-no-conflict
Download link: https://github.com/juliuss1907/knowledge-base/archive/main.zip#obsidian-git-no-conflict

Please download this .zip file, extract it, and install it in the .claude/skills/ directory.
View Source Repository

Agent Skills Search Helper

Install a tiny helper to your Agent, search and equip skill from 620,000+ vetted skills library on demand.