address-merge-conflict

Category: Tools & Productivity | Uploader: rstacruz | Downloads: 0 | Version: v1.0（Latest）

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

Changelog: Source: GitHub https://github.com/rstacruz/agentic-toolkit

Directory Structure

Current level: skill/atk-extras/address-merge-conflict/

📄 SKILL.md 1.1 KB

SKILL.md

---
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)
2. Read the code changes to understand what's happening.
3. If there are decisions to be made, ask the user first using `question` tool. Provide suggested answers and a recommendation.
4. After addressing the conflict, test that it works. Run related automated tests.
5. 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

`````markdown
```javascript
// == path/to/file.ts ==
setup() {
  start() // [🔵 OURS]
  start({ now: true }) // [🟠 THEIRS]

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

Comments 0

Latest | Hot

Please login before commenting.

No comments yet. Be the first one!

address-merge-conflict

Directory Structure

SKILL.md

Report

Notice