resolving-merge-conflicts

Name: resolving-merge-conflicts
Author: tt-a1i

16stars3forks

How to install resolving-merge-conflicts?

tt-a1i/matt-skills-with-to-goal/resolving-merge-conflicts

$npx -y skills add tt-a1i/matt-skills-with-to-goal --skill resolving-merge-conflicts

Installs into the current project.

Summary

Use when you need to resolve an in-progress git merge/rebase conflict.

Files · 1

View on GitHub

SKILL.md

1	1. See the current state of the merge/rebase. Check git history, and the conflicting files.
2
3	2. Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
4
5	3. Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never `--abort`.
6
7	4. Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
8
9	5. Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

tt-a1iPublisher · 26 listings

Preview

tt-a1i/matt-skills-with-to-goal

1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.

2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check

3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **n

4. Discover the project's **automated checks** and run them — typically typecheck, then tests, then format. Fix anything the merge broke.

Repott-a1i/matt-skills-with-to-goal

LicenseMIT

TypeSkills

CategorySearch & RAG

UpdatedJul 2026

Repo stars16

First seenJul 22, 2026

People who liked this also viewed

6 picks

Type

resolving-merge-conflicts

16stars3forks

View on GitHub

How to install resolving-merge-conflicts?

tt-a1i/matt-skills-with-to-goal/resolving-merge-conflicts

$npx -y skills add tt-a1i/matt-skills-with-to-goal --skill resolving-merge-conflicts

Installs into the current project.

Summary

Use when you need to resolve an in-progress git merge/rebase conflict.

Files · 1

View on GitHub

SKILL.md

1	1. See the current state of the merge/rebase. Check git history, and the conflicting files.
2
3	2. Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
4
5	3. Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never `--abort`.
6
7	4. Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
8
9	5. Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

tt-a1iPublisher · 26 listings

Preview

tt-a1i/matt-skills-with-to-goal

1. **See the current state** of the merge/rebase. Check git history, and the conflicting files.

2. **Find the primary sources** for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check

3. **Resolve each hunk.** Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do **n

4. Discover the project's **automated checks** and run them — typically typecheck, then tests, then format. Fix anything the merge broke.

Repott-a1i/matt-skills-with-to-goal

LicenseMIT

TypeSkills

CategorySearch & RAG

UpdatedJul 2026

Repo stars16

First seenJul 22, 2026

People who liked this also viewed

6 picks

Type

1	1. See the current state of the merge/rebase. Check git history, and the conflicting files.
2
3	2. Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
4
5	3. Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never `--abort`.
6
7	4. Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
8
9	5. Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.

1	1. See the current state of the merge/rebase. Check git history, and the conflicting files.
2
3	2. Find the primary sources for each conflict. Understand deeply why each change was made, and what the original intent was. Read the commit messages, check the PRs, check original issues/tickets.
4
5	3. Resolve each hunk. Preserve both intents where possible. Where incompatible, pick the one matching the merge's stated goal and note the trade-off. Do not invent new behaviour. Always resolve; never `--abort`.
6
7	4. Discover the project's automated checks and run them — typically typecheck, then tests, then format. Fix anything the merge broke.
8
9	5. Finish the merge/rebase. Stage everything and commit. If rebasing, continue the rebase process until all commits are rebased.