Resolve Pr Conflicts

Use when a PR has merge conflicts with its base branch, including conflicts found during babysitt…

by jssblck

The skill

Use when a PR has merge conflicts with its base branch, including conflicts found during babysitting or merging.

This skill's licence does not allow redistribution, so the store does not show its text. Read it at the source.

Use this skill

Connect your agent to the Skill Store MCP server and ask for it by ref: jssblck/resolve-pr-conflicts-62996355947.

Markdown version

Details

Publisher: jssblck
Category: Software Development › Source control & code review
Updated: 2026-10-09

References

More from jssblck

Reddit Browse Reddit or perform explicitly requested account actions through the existing signed-in Chro…
Social Fetch Read referenced social posts on X, LinkedIn, Instagram, TikTok, Bluesky, Reddit, Mastodon, Thread…
Write Like Jess Draft or revise prose in Jess's voice when requested, including removing generic AI polish from h…
Babysit Use when asked to babysit a GitHub PR or wait for its CI or review checks.

Related skills

Resolving Merge Conflicts Use when you need to resolve an in-progress git merge/rebase conflict.
Git Conflicts Resolve merge conflicts file-by-file.
Pr Ready Resolve CI failures, merge conflicts, or local branch changes to get a PR ready
Git Rebase Rebase branches and resolve cross-commit conflicts while preserving changes.
Fix Merge Conflicts Resolves git merge conflicts correctness-first, then proves the tree still builds.