# Resolve Pr Conflicts

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

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

- Page: https://ss33.ai/skills/jssblck/resolve-pr-conflicts-62996355947
- Publisher: jssblck
- Category: [Software Development](https://ss33.ai/skills/category/software-development-t44z8z) › [Source control & code review](https://ss33.ai/skills/category/software-development-t44z8z/source-control-and-code-review-jebezw)
- Source: https://github.com/jssblck/agents/blob/20ce5aad022cd67ef84607ce624f0e9ce4f325a6/skills/resolve-pr-conflicts/SKILL.md

## Skill

This skill's licence does not allow redistribution, so the store does not serve its text. Get it from the author: https://github.com/jssblck/agents/blob/20ce5aad022cd67ef84607ce624f0e9ce4f325a6/skills/resolve-pr-conflicts/SKILL.md