Agent-Skills.md

Agent Skills: address-merge-conflict

Gives guidelines for addressing a Git merge conflict with user intervention. Do not invoke unless user asks.

UncategorizedID: rstacruz/agentic-toolkit/address-merge-conflict

Repository

rstacruz/agentic-toolkit
rstacruzLicense: MIT
61

Install this agent skill to your local

pnpm dlx add-skill https://github.com/rstacruz/agentic-toolkit/tree/HEAD/skill/atk-extras/address-merge-conflict

Skill Files

Browse the full folder contents for address-merge-conflict.

Download Skill

Loading file tree…

skill/atk-extras/address-merge-conflict/SKILL.md

Skill Metadata

Name
address-merge-conflict
Description
"Gives guidelines for addressing a Git merge conflict with user intervention. Do not invoke unless user asks."

Help address a merge conflict.

  1. Gather context:
  • git grep "^<<<<<<<" (find merge conflict markers)
  • git status --porcelain (show changed files)
  1. Read the code changes to understand what's happening.
  2. If there are decisions to be made, ask the user first using question tool. Provide suggested answers and a recommendation.
  3. After addressing the conflict, test that it works. Run related automated tests.
  4. Summarise the merge conflict resolutions and give abbreviated code overviews.

Guidelines:

  • Do NOT do any git operations. Leave it for the user to add and commit.

Showing code changes

  • Include pseudocode in it, along with 🔵 OURS and 🟠 THEIRS markers
  • See example below
```javascript
// == path/to/file.ts ==
setup() {
  start() // [🔵 OURS]
  start({ now: true }) // [🟠 THEIRS]

  // Added logging [🟠 THEIRS]
  if (loggingEnabled) {
    log({ event: "started" })
  }
}
```