skills.rest
arjitj2
arjitj2COMMUNITY
Explore all skills by this author →
Website𝕏@ArjitJaiswal7GitHub

resolve-merge-conflicts

Resolves pull request merge conflicts by merging the base branch and pushing the updated branch.

Updated Mar 20, 2026
Search Tags:#git#pull request#github#merge conflicts#code validation#branch reconciliation
One-click install
npx skills add https://github.com/arjitj2/arjit-skills --skill resolve-merge-conflicts-arjitj2
Or copy as Structured Prompt for Agent▼
Please help me install this Agent Skill.
Skill: resolve-merge-conflicts
Source: https://github.com/arjitj2/arjit-skills/tree/main/skills/resolve-merge-conflicts
Command: npx skills add https://github.com/arjitj2/arjit-skills --skill resolve-merge-conflicts-arjitj2

SYSTEM DOCUMENTATION & REQUIREMENTS

What problem does it solve?

This Skill helps you finish the full merge-conflict resolution workflow on an active pull request instead of only identifying the conflict. It guides the branch through merging the base branch, reconciling file differences, validating the result, and pushing the updated branch back to the remote.

Core Features & Use Cases

  • PR Context Inspection: Checks the current branch and PR metadata so the right branch is being repaired.
  • Local Conflict Reconciliation: Merges the base branch locally and carefully resolves conflicted files without discarding intentional work.
  • Validation and Push: Runs targeted validation, completes the merge commit, and pushes the updated branch.
  • Use Case: A pull request shows merge conflicts after new changes land in the base branch, and you want the conflicts resolved, validated, committed, and pushed in one pass.

Quick Start

Use the resolve-merge-conflicts skill to inspect the PR, merge the base branch locally, resolve conflicts, validate the result, and push the updated branch.

Frequently Asked Questions about resolve-merge-conflicts

High-intent search queries and answers about installing and using this skill.

FAQPage Schema
How do I resolve merge conflicts in a pull request after the base branch is updated?▼

To resolve pull request merge conflicts, merge the base branch into your current branch locally, reconcile the conflicting file differences, and push the updated branch back to the remote repository. This ensures your branch is validated and ready to ship.

What's the best way to fix git conflict markers without discarding intentional branch work?▼

Fixing git conflict markers requires carefully reconciling file differences during the local base branch merge. The process targets conflict-marker cleanup while preserving intentional work, followed by targeted verification before completing the merge commit.

Can I automatically validate and push a branch after local conflict resolution?▼

Yes, you can validate and push a branch after local conflict resolution by running targeted validation checks, completing the merge commit, and pushing the updated branch to the remote to finalize the pull request workflow.

Why does my pull request show merge conflicts when the base branch gets new changes?▼

Pull requests show merge conflicts when new changes land in the base branch and clash with your current branch modifications. Resolving this requires merging the base branch locally and reconciling the conflicting files.

How do I inspect PR metadata before reconciling branch conflicts locally?▼

Inspecting PR metadata involves checking the current branch and retrieving pull request context using git and gh metadata inspection. This ensures the correct active branch is targeted before attempting local conflict repair and reconciliation.

Related Skills

Explore More Software Engineering Skills→
berkcangumusisikberkcangumusisik
11

pr-create

Generate GitHub pull requests from the current branch with gh.

Community
Intermediate
TioSavichTioSavich

ship

Merge base branch, run tests, bump version, update changelog, commit, push, and create a pull request.

Community
Advanced
scylladbscylladb
73

fix-backport-conflicts

Resolve Git merge conflict markers in backport pull requests.

Official
Advanced
HorusGoulHorusGoul
8

pull

Pull latest code from a remote Git branch and guide merge conflict resolution.

Community
Intermediate