git-merge-conflict-resolution
Resolve Git merge/rebase conflicts with explicit intent tracking and post-resolution verification. Use when conflicts occur and intent-preserving resolution is required before integration; do not use for CI workflow design or application behavior implementation.
Works with
--- name: git-merge-conflict-resolution description: Resolve Git merge/rebase conflicts with explicit intent tracking and post-resolution verification. Use when conflicts occur and intent-preserving resolution is required before integration; do not use for CI workflow design or application behavior implementation. license: Apache-2.0 --- # Git Merge Conflict Resolution ## Overview Use this skill to resolve conflicts without silently dropping behavior from either side. ## Scope Boundaries - Use this skill when the task matches the trigger condition described in `description`. - Do not use this skill when the primary task falls outside this skill's domain. ## Shared References - Semantic conflict triage: - `references/semantic-conflict-triage.md` ## Templates And Assets - Resolution log template: - `assets/conflict-resolution-log-template.md` - Verification checklist: - `assets/conflict-verification-checklist.md` ## Inputs To Gather - Conflicted files and conflict types. - Intent of each conflicting change set. - Required tests and high-risk behavioral paths. - Domain-owner contacts for ambiguous semantic conflicts. ## Deliverables - Conflict resolution decisions with rationale. - File-level intent mapping for resolved hunks. - Verification evidence for resolved behavior. ## Workflow 1. Classify conflicts by behavioral impact and risk. 2. Resolve textual conflicts while preserving intent from both sides. 3. Log rationale in `assets/conflict-resolution-log-template.md`. 4. Validate with `assets/conflict-verification-checklist.md`. 5. Escalate unresolved semantic ambiguity using `references/semantic-conflict-triage.md`. ## Quality Standard - Every resolved hunk has explicit intent rationale. - No conflict markers remain. - Affected behaviors are re-verified by tests/manual checks. - High-risk semantic merges receive domain-owner review. ## Failure Conditions - Stop when change intent cannot be reconstructed confidently. - Stop when semantic correctness cannot be verified post-resolution. - Escalate when domain arbitration is needed for ambiguous merges.
More Git Workflows skills
git-commit
github/awesome-copilot
Execute git commit with conventional commit message analysis, intelligent staging, and message generation. Use when user asks to commit changes, create a git commit, or mentions "/commit". Supports: (1) Auto-detecting type and scope from changes, (2) Generating conventional commit messages from diff, (3) Interactive commit with optional type/scope/description overrides, (4) Intelligent file staging for logical grouping
git-workflow-and-versioning
addyosmani/agent-skills
Structures git workflow practices. Use when making any code change. Use when committing, branching, resolving conflicts, or when you need to organize work across multiple parallel streams. Use when cutting a release, choosing a semantic version bump, tagging, or writing a changelog.
resolve-merge-conflicts
warpdotdev/common-skills
Resolve Git merge conflicts by extracting only unresolved paths, conflict hunks, and compact diffs instead of loading whole files into context. Use when a merge, rebase, cherry-pick, or stash pop stops on conflicts, when `git status` shows unmerged paths, or when files contain conflict markers.
