Skill: PR Management

Purpose

Manage pull request lifecycle including reviews, updates, merging, and closing.

When to Use

• Reviewing PRs assigned to you
• Responding to review feedback
• Merging approved PRs
• Managing PR status and labels
• Resolving merge conflicts

Tools Used

• git CLI commands
• gh CLI (GitHub CLI)

Configuration

{
  "owner": "{{github.owner}}",
  "repo": "{{github.repo}}",
  "defaultBranch": "{{github.defaultBranch}}"
}

---

PR Lifecycle

States

Draft → Open → In Review → Changes Requested → Approved → Merged
                    ↓
                 Closed (without merge)

State Transitions

Current	Action	Next
Draft	Mark ready	Open
Open	Request review	In Review
In Review	Approve	Approved
In Review	Request changes	Changes Requested
Changes Requested	Push updates	In Review
Approved	Merge	Merged
Any	Close	Closed

---

Managing PRs with gh CLI

Listing and Viewing

# List open PRs
gh pr list

# List PRs needing review
gh pr list --search "review-requested:@me"

# List your PRs
gh pr list --author "@me"

# List with filters
gh pr list --state open --label "bug" --limit 10

# View specific PR
gh pr view 123

# View PR diff
gh pr diff 123

# View PR checks
gh pr checks 123

# Open PR in browser
gh pr view 123 --web

Updating PRs

# Edit title
gh pr edit 123 --title "New title"

# Edit body
gh pr edit 123 --body "New description"

# Add/remove labels
gh pr edit 123 --add-label "ready-for-review"
gh pr edit 123 --remove-label "work-in-progress"

# Add/remove reviewers
gh pr edit 123 --add-reviewer @username
gh pr edit 123 --remove-reviewer @username

# Add/remove assignees
gh pr edit 123 --add-assignee @username

# Set milestone
gh pr edit 123 --milestone "v1.0"

# Convert draft to ready
gh pr ready 123

# Convert to draft
gh pr ready 123 --undo

Merging PRs

# Merge (default strategy)
gh pr merge 123

# Merge with squash
gh pr merge 123 --squash

# Merge with rebase
gh pr merge 123 --rebase

# Merge and delete branch
gh pr merge 123 --delete-branch

# Auto-merge when checks pass
gh pr merge 123 --auto --squash

# Disable auto-merge
gh pr merge 123 --disable-auto

Closing PRs

# Close without merging
gh pr close 123

# Close with comment
gh pr close 123 --comment "Closing - superseded by #456"

# Reopen closed PR
gh pr reopen 123

---

Review Feedback Workflow

Addressing Review Comments

## Review Response Process

1. **Read all comments** - Understand the full feedback
2. **Acknowledge** - Respond to each comment
3. **Make changes** - Address requested changes
4. **Push updates** - Commit and push
5. **Re-request review** - Notify reviewers

Push Updates

# Make changes locally
git add .
git commit -m "fix: address review comments"

# Push to PR branch
git push

# Or amend if fixing small issues (unpushed commits only)
git commit --amend --no-edit
git push --force-with-lease

Re-Request Review

# Request re-review via gh
gh pr edit 123 --add-reviewer @reviewer

# Or via comment
gh pr comment 123 --body "@reviewer Changes addressed, ready for re-review"

---

Merge Conflicts

Resolving Conflicts

# Update base branch
git checkout {{github.defaultBranch}}
git pull origin {{github.defaultBranch}}

# Go back to feature branch
git checkout feature/my-branch

# Merge base into feature (or rebase)
git merge {{github.defaultBranch}}
# OR
git rebase {{github.defaultBranch}}

# Resolve conflicts in files
# Edit conflicted files, then:
git add <resolved-files>

# Complete merge
git commit
# OR for rebase
git rebase --continue

# Push updates
git push
# If rebased, may need:
git push --force-with-lease

Conflict Resolution Template

## Merge Conflict Resolution

**PR:** #{{prNumber}}
**Conflicting Files:**
{{#each files}}
- {{file}}
{{/each}}

**Resolution Approach:**
{{resolutionDescription}}

**Changes Made:**
{{#each resolutions}}
- {{file}}: {{resolution}}
{{/each}}

**Verification:**
- [ ] Build passes
- [ ] Tests pass
- [ ] Manually verified affected functionality

---

PR Labels

Standard Labels

Label	Purpose	Color
bug	Bug fix	Red
feature	New feature	Green
documentation	Docs only	Blue
breaking-change	Breaking change	Orange
needs-review	Ready for review	Yellow
changes-requested	Has review feedback	Purple
approved	Approved, ready to merge	Green
do-not-merge	Not ready	Red
work-in-progress	Still in progress	Gray

Applying Labels

# Add label
gh pr edit 123 --add-label "needs-review"

# Remove label
gh pr edit 123 --remove-label "work-in-progress"

# Multiple labels
gh pr edit 123 --add-label "bug,priority-high,needs-review"

---

Merge Strategies

Options

Strategy	Use When	Result
Merge Commit	Preserve full history	Merge commit created
Squash	Clean single commit	All commits squashed
Rebase	Linear history	Commits replayed

Choosing Strategy

## Merge Strategy Guidelines

**Use Squash when:**
- Many small "fix" commits
- WIP commits in history
- Single logical change

**Use Merge Commit when:**
- Multiple logical commits
- Want to preserve history
- Large feature with milestones

**Use Rebase when:**
- Want linear history
- Small, clean commits
- Team convention

---

PR Comments

Adding Comments

# Add comment to PR
gh pr comment 123 --body "Comment text"

# Add review comment
gh pr review 123 --comment --body "General feedback"

# Approve with comment
gh pr review 123 --approve --body "LGTM!"

# Request changes with comment
gh pr review 123 --request-changes --body "Please address..."

Comment Templates

## Approval Comment
LGTM!

**Reviewed:**
- [x] Code quality
- [x] Test coverage
- [x] Documentation

Ship it! 🚀

---

## Changes Requested Comment
Thanks for the PR! A few items to address:

### Required Changes
1. {{change1}}
2. {{change2}}

### Suggestions (non-blocking)
- {{suggestion1}}

Let me know when ready for re-review.

---

Jira Integration

Update Story on PR Events

// PR merged - transition story
Atlassian:addCommentToJiraIssue({
  cloudId: "{{jira.cloudId}}",
  issueIdOrKey: "{{storyKey}}",
  commentBody: `🤖 **Developer Agent** - PR Merged

**PR:** [#{{prNumber}}]({{prUrl}}) merged to {{baseBranch}}
**Merge Type:** {{mergeType}}
**By:** {{mergedBy}}

Code is now in {{baseBranch}} and will be deployed with next release.`
})

---

Used By Agents

Agent	PR Management Use
Senior Developer	Reviews, approves, merges PRs
Junior Developer	Responds to feedback, updates PRs
DevOps Engineer	Manages deployment PRs
Project Manager	Tracks PR status

Error Handling

Error	Cause	Resolution
PR not mergeable	Conflicts exist	Resolve merge conflicts
Required checks failing	CI failed	Fix failing checks
Required reviews missing	Need approvals	Request reviews
Branch protection	Rules not met	Meet all requirements