How do I install the Git Merge skill?

Run npx skillmds@latest add aws-samples/git-merge in your terminal (requires Node.js), paste this page's agent-chat prompt into Claude, Cursor, or any MCP-connected agent, or download the SKILL.md file and copy it into your agent's skills directory.

Is Git Merge safe to use?

This skill has not completed SkillMD's automated safety review yet. SkillMD never runs a skill's scripts for you; review the SKILL.md before installing.

Which AI agents work with Git Merge?

This skill is tagged as working with Claude Code, Claude.ai, OpenAI Codex. SKILL.md is an open format, so most agents that read a skills directory can load it too.

Is Git Merge free to use?

Yes. Installing skills from SkillMD is free, and the skill stays under its author's original license.

Who published Git Merge?

aws-samples (@aws-samples) published this skill. Their other Agent Skills are listed on their SkillMD profile.

Git Merge by aws-samples — Agent Skill

Name: Git Merge
Author: aws-samples

Git Merge

Resolve git merge conflicts in AI-DLC multi-user projects. Use this skill when users mention merge conflicts, git merge, pull conflicts, or when multiple developers are working on different AI-DLC units in parallel and need to combine their work. Covers both AI-DLC state file conflicts (aidlc-state.md, audit.md) and application code conflicts from shared/common units.

aws-samples d5700a3 3 files · 8.2 KB Updated Sep 17, 2026

File contents

Git Merge Conflict Resolver for AI-DLC Projects

Resolve git merge conflicts that arise when multiple developers work on different AI-DLC units in parallel during the CONSTRUCTION phase.

When This Happens

After INCEPTION phase completes, the project is split into units. Multiple developers clone the repo and each runs CONSTRUCTION on their assigned unit. When they push/merge back:

State file conflicts — aidlc-docs/aidlc-state.md and aidlc-docs/audit.md are modified by every developer since each tracks their own unit's progress
Code conflicts — shared/common units modified by one developer conflict with another developer's changes or dependencies on that shared code

Conflict Resolution Workflow

Step 1: Detect and Classify Conflicts

Run git status to identify conflicted files, then classify each:

git diff --name-only --diff-filter=U

Classify each conflicted file into:

State file — matches aidlc-docs/aidlc-state.md or aidlc-docs/audit.md
Code file — everything else (application code, config, infrastructure)

Step 2: Resolve State File Conflicts

Read references/state-file-merge.md for the detailed merge strategy.

State files are logically non-conflicting — each developer wrote about their own unit. The strategy is:

aidlc-state.md — merge unit progress sections, preserving both sides' checkbox states
audit.md — combine entries chronologically by timestamp

These can be resolved automatically without user confirmation.

Step 3: Resolve Code Conflicts

Read references/code-conflict-merge.md for the detailed analysis strategy.

Code conflicts require understanding intent. For each conflicted code file:

Read the conflict markers to understand both sides
Load relevant design artifacts from aidlc-docs/construction/{unit-name}/ for context
Determine if changes are independent (both can coexist) or truly conflicting (one must win)
Present the analysis and proposed resolution to the user
Apply only after user approval

Step 4: Verify and Complete

After all conflicts are resolved:

git diff --name-only --diff-filter=U

Confirm zero remaining conflicts, then inform the user the merge is ready to commit.

---name: git-mergedescription: Resolve git merge conflicts in AI-DLC multi-user projects. Use this skill when users mention merge conflicts, git merge, pull conflicts, or when multiple developers are working on different AI-DLC units in parallel and need to combine their work. Covers both AI-DLC state file conflicts (aidlc-state.md, audit.md) and application code conflicts from shared/common units.---# Git Merge Conflict Resolver for AI-DLC ProjectsResolve git merge conflicts that arise when multiple developers work on different AI-DLC units in parallel during the CONSTRUCTION phase.## When This HappensAfter INCEPTION phase completes, the project is split into units. Multiple developers clone the repo and each runs CONSTRUCTION on their assigned unit. When they push/merge back:1. **State file conflicts** — `aidlc-docs/aidlc-state.md` and `aidlc-docs/audit.md` are modified by every developer since each tracks their own unit's progress2. **Code conflicts** — shared/common units modified by one developer conflict with another developer's changes or dependencies on that shared code## Conflict Resolution Workflow### Step 1: Detect and Classify ConflictsRun `git status` to identify conflicted files, then classify each:```bashgit diff --name-only --diff-filter=U```Classify each conflicted file into:- **State file** — matches `aidlc-docs/aidlc-state.md` or `aidlc-docs/audit.md`- **Code file** — everything else (application code, config, infrastructure)### Step 2: Resolve State File ConflictsRead `references/state-file-merge.md` for the detailed merge strategy.State files are logically non-conflicting — each developer wrote about their own unit. The strategy is:- `aidlc-state.md` — merge unit progress sections, preserving both sides' checkbox states- `audit.md` — combine entries chronologically by timestampThese can be resolved automatically without user confirmation.### Step 3: Resolve Code ConflictsRead `references/code-conflict-merge.md` for the detailed analysis strategy.Code conflicts require understanding intent. For each conflicted code file:1. Read the conflict markers to understand both sides2. Load relevant design artifacts from `aidlc-docs/construction/{unit-name}/` for context3. Determine if changes are independent (both can coexist) or truly conflicting (one must win)4. Present the analysis and proposed resolution to the user5. Apply only after user approval### Step 4: Verify and CompleteAfter all conflicts are resolved:```bashgit diff --name-only --diff-filter=U```Confirm zero remaining conflicts, then inform the user the merge is ready to commit.

Frequently asked questions