Merge Workflow

SkillDev tools

Use when the user asks to merge, land, rebase before landing, resolve landing conflicts, or advance an integration branch such as main, master, or m3.

Available today. Use it from your connected AI after setup.

Connect ahel once, and every AI you use reads what you have installed.

Then ask your AI: use the Merge Workflow skill

What this skill tells your AI

The instructions your AI receives, as published by divad12/dotfiles in .agents/skills/merge/SKILL.md and read by ahel’s review.

Read ~/dotfiles/docs/ai/git.md first. It is the canonical contract for target selection, squash audits, local-target-only landing, rebase conflict handling, and merge-commit exceptions.

Default path: inspect <target>..HEAD, squash noisy commits when needed, rebase onto the local target branch, fast-forward the target worktree with git merge --ff-only <branch>, then verify both refs.

Capture landing learnings

Do not run learn --repo "$PWD" check-merge as a required merge gate. Branch-relevant learnings can be captured during normal closeout without blocking unrelated landings.

Signals

GitHub stars
25
Forks
4
Last commit
Sep 2026
Hacker News mentions
20
Advanced
Catalog kind
skill
Gateway key
merge-divad12
Source
github.com/divad12/dotfiles