Skip to content

Commit 6088233

Browse files
committed
Add pr-review skill and update branch-sync workflow
Adds a comprehensive PR review skill covering: full branch diff analysis, standards compliance checklist, documentation requirements, manual validation, comment resolution, and learning capture back to skills. Also documents the mandatory master-merge step in git-workflow and updates SKILL.md, README, and github-interaction with references.
1 parent 77817ac commit 6088233

File tree

5 files changed

+528
-1
lines changed

5 files changed

+528
-1
lines changed

.agents/skills/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ All project-specific skills live in **[`churchcrm/`](./churchcrm/)**. See [`chur
7373
### Development Process
7474
- [Git Workflow](./churchcrm/git-workflow.md)
7575
- [GitHub Interaction](./churchcrm/github-interaction.md)
76+
- [PR Review](./churchcrm/pr-review.md)
7677
- [Development Workflows](./churchcrm/development-workflows.md)
7778
- [Code Standards](./churchcrm/code-standards.md)
7879
- [Wiki Documentation](./churchcrm/wiki-documentation.md)
@@ -103,6 +104,7 @@ They are registered in `~/.claude/CLAUDE.md` for automatic discovery.
103104

104105
**Example workflows:**
105106

107+
- **Review a PR**: `pr-review.md``code-standards.md``security-best-practices.md``wiki-documentation.md`
106108
- **New API endpoint**: `api-development.md``service-layer.md``slim-4-best-practices.md``security-best-practices.md``cypress-testing.md``git-workflow.md`
107109
- **Migrate legacy page**: `routing-architecture.md``admin-mvc-migration.md``frontend-development.md``database-operations.md``git-workflow.md`
108110
- **Fix security issue**: `security-best-practices.md``authorization-security.md``php-best-practices.md``git-workflow.md`

.agents/skills/churchcrm/SKILL.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,8 @@ Project-specific skills for AI agents and developers working on ChurchCRM. Each
8686
|-------|------------|
8787
| [Git Workflow](./git-workflow.md) | Commits, PRs, pre-commit validation |
8888
| [GitHub Interaction](./github-interaction.md) | Reviews, commits, PR management |
89-
| [PR Description Guidelines](./pr-description-guidelines.md) | Ensure PR bodies are written in Markdown with required sections (Summary, Changes, Files Changed, Validation, Testing) |
89+
| [PR Review](./pr-review.md) | Full PR review: fetch changes, validate standards, check docs/wiki, manual testing, address comments, capture learnings |
90+
| [PR Description Guidelines](../pr-description-guidelines.md) | Ensure PR bodies are written in Markdown with required sections (Summary, Changes, Files Changed, Validation, Testing) |
9091
| [Development Workflows](./development-workflows.md) | Setup, build, Docker management |
9192
| [Code Standards](./code-standards.md) | General coding, quality checks, PR reviews |
9293
| [Wiki Documentation](./wiki-documentation.md) | Complex documentation, admin guides |
@@ -103,3 +104,5 @@ Project-specific skills for AI agents and developers working on ChurchCRM. Each
103104
- **Add UI text**: `i18n-localization.md``frontend-development.md``git-workflow.md`
104105
- **Write release notes**: `release-notes.md``github-interaction.md`
105106
- **Publish a release**: `release-notes.md``social-media-release.md``github-interaction.md`
107+
- **Review a PR**: `pr-review.md``code-standards.md``security-best-practices.md``wiki-documentation.md`
108+
- **Address PR comments**: `pr-review.md``github-interaction.md``git-workflow.md`

.agents/skills/churchcrm/git-workflow.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,28 @@ Fixes #7698
191191
- **Testing** - How to verify, test commands
192192
- **Related Issues** - Links to related issues/PRs
193193

194+
### Keeping Branches Up to Date
195+
196+
**Always merge master into a PR branch before reviewing or testing it.** A branch that has diverged from master may have hidden conflicts or stale code that makes the review misleading.
197+
198+
```bash
199+
git fetch origin
200+
git checkout <branch-name>
201+
git merge origin/master # Bring branch up to date
202+
203+
# If conflicts arise: resolve, stage, commit, push
204+
git add <resolved-files>
205+
git commit -m "Merge master into <branch-name> to resolve conflicts"
206+
git push origin <branch-name>
207+
```
208+
209+
**Rules:**
210+
- Resolve conflicts in favour of the PR's intent — do not silently drop changes
211+
- Push the merge commit back to origin so CI runs against the updated state
212+
- If you resolve conflicts on someone else's PR, leave a comment explaining what was resolved
213+
214+
---
215+
194216
### Code Review Checklist
195217

196218
Before marking PR ready for review, ensure:

.agents/skills/churchcrm/github-interaction.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
Purpose: practical, step-by-step actions for handling reviews, commits, and PRs. This file is an actionable companion to the canonical `git-workflow.md` (policy) and the `gh-cli` skill (commands).
44

5+
For a **full PR review workflow** (fetching changes, standards checklist, doc updates, manual validation, capturing learnings), see [`pr-review.md`](./pr-review.md).
6+
57
Quick checklist — Addressing reviews
68
- Read comments and ask clarifying questions if needed.
79
- Make one focused change per review thread; add tests where applicable.

0 commit comments

Comments
 (0)