gpsaggese/helpers / .claude/skills/github.split_branch_in_PRs
github.split_branch_in_PRs
VerifiedSplit current Git changes into small, cohesive PRs to simplify merging
| File | Kind | Size |
|---|---|---|
| SKILL.md | skill md | 3.1 KB |
SKILL.md
View on GitHub---
description: Split current Git changes into small, cohesive PRs to simplify merging
model: sonnet
---
# Goal
- Propose how to split the changes between current `HEAD` of the branch and
`origin/master` into small PRs to minimize:
- The review complexity
- The risk of breaking the unit tests
- If the task is not perfectly clear or complex, you MUST not perform it, but ask
for clarifications and create a plan for review
- Create a `plan.md` with 5 bullet points explaining what the plan is
# Workflow
## Read Rules
- Read rules about:
- **Coding**: `.claude/skills/coding.rules.md`
- **Unit tests**: `.claude/skills/testing.rules.md`
## Read the Changes in the Current Git Client
- Obtain the files that need to be merged with:
```bash
git diff --name-status origin/master HEAD
...
```
- Analyze the difference between the current client and `master` (or
`origin/master`):
```bash
git diff master...HEAD --name-only
# or if master is not available locally:
git diff origin/master...HEAD --name-only
```
## Propose PRs
- Propose a set of PRs that decompose the changes in the current Git client, so
that there are coherent and tightly coupled changes
- Prefer PRs that change entire files, not split a file across PRs
- Keep each file and its test file in the same PR
- Merge low risk / complexity PRs to have fewer PRs, even if the merged PR is the
sum of simpler ones
- Describe each merged unit as its own bullet
## Order the PRs
- Start with the PRs that have low risk and touch most files
## Create pytest Commands
- For each PR create:
- A file `pr<NUM>.files.txt` with the files changed, e.g.,
```verbatim
.claude/skills
.claude/templates
.claude/notify.sh
.claude/settings.local.json
```
- A file `pr<NUM>.pytest.sh` with the pytest command to run to exercise the
changes by running the tests in all the modified files and make sure the PR
is running successfully, e.g.,
```bash
#!/bin/bash
pytest_log \
dev_scripts_helpers/coding_tools/test \
dev_scripts_helpers/dockerize/test \
linters2/test \
$@
```
- Make this script executable with `chmod +x pr<NUM>.pytest.sh`
## Report the Output
- Create a file `github_PR_plan.md` with the plan to split the PRs, following
strictly the format in `.claude/templates/github_PR_plan.template.md`
- Say in the file `github_PR_plan.md` how it was generated, with this line right
after the title:
```markdown
- Generated by `.claude/skills/github.split_branch_in_PRs/SKILL.md`
```
- If the file `github_PR_plan.md` already exists then update it, removing
the PRs already merged based on the current `i git_files` and the `git log`
- Run the linter on `github_PR_plan.md`
```bash
> lint_text.py -i github_PR_plan.md
```
# Verification
- [ ] Confirm every changed file is assigned to exactly one PR
- [ ] Confirm each PR's `pr<NUM>.pytest.sh` is executable and passes
- [ ] Confirm `github_PR_plan.md` passes `lint_text.py`
- [ ] The file `github_PR_plan.md` says that it was generated by
`.claude/skills/github.split_branch_in_PRs/SKILL.md`
Related skills
| Skill | Stars | Updated | Works with | Status | Install |
|---|---|---|---|---|---|
| receiving-code-reviewobra/superpowersUse when receiving code review feedback, before implementing suggestions, especially if feedback seems unclear or technically questionable - requires technical rigor and verification, not performative agreement or blind implementation | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |
| requesting-code-reviewobra/superpowersUse when completing tasks, implementing major features, or before merging to verify work meets requirements | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |
| using-git-worktreesobra/superpowersUse when starting feature work that needs isolation from current workspace or before executing implementation plans - ensures an isolated workspace exists via native tools or git worktree fallback | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |
| verification-before-completionobra/superpowersUse when about to claim work is complete, fixed, or passing, before committing or creating PRs - requires running verification commands and confirming output before making any success claims; evidence before assertions always | Stars: 322k | Updated | Claude CodeCodex | Verified | Install |