flowmade-one/architecture
3
0
Fork 0
Code Issues 15 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Improve PR review workflow

Browse Source 
- Remove fj pr status (doesn't work reliably)
- Post review summary as comment before merging
- Delete branch after merge with -d flag
- Document all merge options in forgejo skill

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Hugo Nijhuis
2025-12-29 00:16:01 +01:00
parent 801f044a54
commit 1f3fcd5b7d
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
commands/review-pr.md
View File

@@ -6,8 +6,7 @@ argument-hint: <pr-number>
# Review PR #$1 # Review PR #$1
1. **View PR details**: `fj pr view $1` 1. **View PR details**: `fj pr view $1`
2. **Check status**: `fj pr status $1` 2. **Get the diff**: `fj pr view $1 diff`
3. **Get the diff**: `fj pr view $1 diff`
Review the changes and provide feedback on: Review the changes and provide feedback on:
- Code quality - Code quality
@@ -16,6 +15,6 @@ Review the changes and provide feedback on:
- Documentation - Documentation
Ask the user what action to take: Ask the user what action to take:
- **Merge**: `fj pr merge $1` - Approve and merge the PR - **Merge**: Post review summary as comment, then `fj pr merge $1 -d` (deletes branch after merge)
- **Request changes**: `fj pr comment $1 "<feedback>"` - Leave feedback without merging - **Request changes**: `fj pr comment $1 "<feedback>"` - Leave feedback without merging
- **Comment only**: `fj pr comment $1 "<comment>"` - Add a comment for discussion - **Comment only**: `fj pr comment $1 "<comment>"` - Add a comment for discussion

10
skills/forgejo/SKILL.md
View File

@@ -54,15 +54,15 @@ fj pr view <number> diff # PR diff
fj pr create "<title>" --body "<body>" fj pr create "<title>" --body "<body>"
fj pr create "<title>" --body "Closes #<issue>" fj pr create "<title>" --body "Closes #<issue>"
# PR status
fj pr status <number> # CI status, reviews
# Comment on PR # Comment on PR
fj pr comment <number> "<comment>" fj pr comment <number> "<comment>"
# Merge # Merge
fj pr merge <number> fj pr merge <number> # Default merge
fj pr merge <number> --squash fj pr merge <number> -d # Delete branch after merge
fj pr merge <number> -M squash # Squash commits
fj pr merge <number> -M rebase # Rebase commits
fj pr merge <number> -M rebase-merge # Rebase then merge commit
``` ```
### Repository ### Repository