AGENT SKILL

resolving-merge-conflicts

Systematic merge conflict resolution that understands why each side made its change before choosing a resolution.

License 许可
MIT
最近更新
2026-08-05
Stars
★ 0
Forks
0

01 前言 Front Matter

name
resolving-merge-conflicts
description
Systematic merge conflict resolution that understands why each side made its change before choosing a resolution.

03 SKILL.md 正文

Resolving merge conflicts

Process

  1. See the current state — check git history and list conflicting files.

  2. Find primary sources for each conflict — understand why each side made its change. Review commit messages, PRs, and original tickets.

  3. Resolve each hunk preserving both intents where possible. When incompatible, select the resolution matching the merge's stated goal and document the trade-off in the commit message. Never invent new behavior that neither side intended.

  4. Run automated checks — typecheck, tests, format. Fix any breakage introduced by the resolution.

  5. Finish the merge/rebase — stage everything and commit. If rebasing, continue until all commits are applied.

What this skill must never do

  • Never resolve by silently dropping one side's changes.
  • Never invent new behavior — only combine or choose existing intents.
  • Never skip automated checks after resolution.
  • Never abort without attempting resolution first.

04 同仓库更多 Skills

lynchypin
lynchypin/project-onboard

wayfinder

The orchestration hub for all work. Creates a map of investigation tickets (grilling, research, prototype, task, bug), resolves them one at a time with strict grilling discipline, manages risk posture pauses during implementation, and hands off to to-spec when the map is complete. Use for any work regardless of size — a trivial task has a small map, a large migration has many tickets.

★ 0
lynchypin
lynchypin/project-onboard

to-tickets

Break the spec into small, independently-implementable tracer-bullet vertical slices. No checkpoint gate — hands off directly to wayfinder for implementation orchestration.

★ 0
lynchypin
lynchypin/project-onboard

to-spec

Synthesize a specification from the completed wayfinder map. Never runs its own interview — it only writes down what wayfinder's grilling tickets already established, at a depth proportional to the project's documentation tier.

★ 0
lynchypin
lynchypin/project-onboard

tdd

Reference material for test-driven development discipline. Red before green, one slice at a time. Use as reference during implementation, not as a step-by-step procedure.

★ 0
lynchypin
lynchypin/project-onboard

start-session

Orient a new session in any project directory. Detects empty directory, existing codebase, or resume state, gathers cheap signals, and routes to wayfinder. The only user-invoked entry point.

★ 0
lynchypin
lynchypin/project-onboard

setup

Configures the issue tracker. Called by start-session during first orient. Model-invoked — runs automatically as part of the flow, not user-triggered.

★ 0