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

Use rebase + fast-forward as default merge strategy

Browse Source 
🤖 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:17:32 +01:00
parent 1f3fcd5b7d
commit 9d8b5a7e06
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
commands/review-pr.md
View File

@@ -15,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**: Post review summary as comment, then `fj pr merge $1 -d` (deletes branch after merge) - **Merge**: Post review summary as comment, then `fj pr merge $1 -M rebase -d` (rebase + fast-forward, deletes branch)
- **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