Menu
Resolve merge, rebase, cherry-pick, formatter, generated-file, and commit-history conflicts safely while minimizing unrelated churn.
Install with Codex or Claude Copy this prompt, paste it into Codex, Claude, or another assistant, and let it review the skill page and install it for you.
Based on SOC occupation classification
Create and modify GameMaker resources through structured project tooling. Use when working with objects, events, rooms, scripts, instances, project metadata, or resource relationships.
Use this skill to remove compatibility shims, legacy behavior wrappers, and import/export pass-through files by migrating call sites to direct ownership APIs.
Organize GameMaker resources, manage layout and naming, structure project notes, and establish reusable architectural systems. Use when organizing resources, naming systems, or structuring GameMaker projects.
Use Playwright to inspect, navigate, and play a running browser-based GameMaker game. Use when the user wants the agent to verify gameplay, menus, input, screenshots, browser behavior, or the exported HTML5 game loop. This skill is for operating the game through the browser like a player, not for editing code.
Understand and work with GameMaker Language (GML), including its syntax differences from JavaScript, GML-specific language constructs, data accessors, keywords, constants, and formatting conventions.
Apply adversarial verification during any meaningful code change before the approach hardens. Use for medium or larger changes where regressions, hidden coupling, ownership mistakes, or invalid assumptions are plausible. Skip only for trivial mechanical edits.
| name | merge-conflict-resolution |
| description | Resolve merge, rebase, cherry-pick, formatter, generated-file, and commit-history conflicts safely while minimizing unrelated churn. |
Resolve merge, rebase, cherry-pick, and formatter conflicts safely while preserving repository conventions, minimizing accidental churn, and maintaining a clean commit history.
Resolve merge, rebase, cherry-pick, and formatter conflicts safely while preserving repository conventions, minimizing accidental churn, and maintaining a clean commit history.
This skill prioritizes:
Identify:
Current branch
Base/target branch
Conflict type:
Inspect repository state:
git status
git branch --show-current
git log --oneline --graph --decorate -20
Review pending scope:
git diff --stat origin/<base>...HEAD
Understand:
Formatter/linter mismatches create avoidable conflicts.
Before resolving conflicts:
git fetch origin
git worktree add ../base-format origin/<base>
Validate the base branch formatter output:
cd ../base-format
pnpm install
pnpm run format
pnpm run lint:fix
git status --short
If formatter output changes the base branch unexpectedly:
Back in the PR branch:
git checkout origin/<base> -- eslint.config.js ".prettier*" .editorconfig
Also restore any repository-specific tooling files that influence formatting or ordering:
Reinstall dependencies if needed:
pnpm install --recursive --force
pnpm run format
pnpm run lint:fix
Inspect the resulting diff carefully:
git status --short
git diff
Mechanical formatter changes may be committed separately if appropriate.
Remove temporary worktree:
git worktree remove ../base-format
Refresh refs:
git fetch origin
git remote -v
Ensure branch is current:
git switch <branch>
If branch does not exist locally:
git switch --track origin/<branch>
Abort if unrelated changes exist:
git status --short
Only expected normalization or conflict-resolution files should appear.
Prefer non-destructive merge flow:
git merge --no-commit --no-ff origin/<base>
Alternative:
git rebase origin/<base> if repository policy prefers rebasingInspect conflicts:
git status
git diff --merge
For each file:
After resolving a file:
git diff <file>
Stage incrementally:
git add <file>
Do NOT bulk-stage unresolved work.
Generated artifacts should usually be regenerated.
Examples:
Prefer:
pnpm run build
pnpm run generate
pnpm test -u
Avoid hand-editing generated outputs unless explicitly required.
If both branches reformatted the same files differently:
Never manually preserve conflicting formatting styles.
Run all relevant validation:
pnpm test
pnpm run lint
pnpm run typecheck
pnpm run build
Also validate:
Re-check final scope:
git diff --stat origin/<base>...HEAD
Ensure only intentional files changed.
Merge commits should clearly explain:
Example:
Resolve merge conflicts with formatter normalization
- Synced formatter configs from main
- Re-generated snapshots
- Preserved new CLI workspace behavior
- Avoided unrelated formatting churn
Ensure branch is fully up to date:
git fetch origin
git merge --ff-only origin/<base>
or:
git rebase origin/<base>
Expected result:
Already up to date.
Never modify golden fixtures unintentionally.
If golden outputs changed:
Never manually edit lockfiles unless absolutely necessary.
Prefer:
pnpm install
Then review resulting changes carefully.
Do not combine:
into a single commit unless explicitly required.
If CI fails after conflict resolution:
Reproduce locally
Identify whether:
Fix root cause instead of patching symptoms
When conflicts stack together, resolve in this order:
Avoid:
git add .A successful merge resolution: