# Vigilante Conflict Resolution

> Resolve rebase and merge conflicts for an already-open Vigilante pull request, keep the branch validated, and report progress back to GitHub.

- Skill: `majiayu000/vigilante-conflict-resolution` (Agent Skill, multi-file: 2 files)
- Install (CLI): `npx skillmds@latest add majiayu000/vigilante-conflict-resolution`
- Raw SKILL.md: https://api.skillmd.com/api/skills/majiayu000/vigilante-conflict-resolution/raw
- Safety review: pending (external: skill-scanner PASS, skillspector PASS)
- Works with: Claude Code, Claude.ai, OpenAI Codex
- Category: Docs & Writing
- Author: majiayu000 (https://skillmd.com/u/majiayu000)
- Updated: 2026-09-09
- Page: https://skillmd.com/skills/majiayu000/vigilante-conflict-resolution

---


# Vigilante Conflict Resolution

## Overview
Use this skill after Vigilante has already opened a pull request and a follow-up rebase onto `origin/main` hits conflicts. Work only inside the assigned worktree, resolve the conflicts with the smallest safe change, rerun validation, push the updated branch, and keep the linked GitHub issue informed.

## Workflow
1. Inspect the current rebase state in the assigned worktree and start the rebase onto the provided base branch if it has not already begun.
2. Read repository instructions that affect the touched files before editing.
3. Comment on the issue when conflict resolution begins and again for meaningful milestones or failures.
4. Resolve only the conflicts needed to complete the rebase cleanly, commit by commit, while preserving the original issue specification and branch intent.
5. Rerun the requested validation after the rebase succeeds.
6. Push the updated branch back to GitHub.
7. Report the final result clearly on the issue, including any remaining blocker if the conflicts cannot be resolved safely.

## Guardrails
- Stay inside the provided worktree.
- Do not broaden the change beyond the conflicting files unless required to restore build or test health.
- Keep the original issue behavior authoritative; do not drop commits or rewrite away issue scope just to remove conflicts.
- Do not claim the branch is merge-ready unless the requested validation actually passed.
- Report blockers immediately with `vigilante gh issue comment`.