From 9d8b5a7e0612608c79ce84cff598f72d3adfed45 Mon Sep 17 00:00:00 2001 From: Hugo Nijhuis Date: Mon, 29 Dec 2025 00:17:32 +0100 Subject: [PATCH] Use rebase + fast-forward as default merge strategy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- commands/review-pr.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/commands/review-pr.md b/commands/review-pr.md index fdaaaf9..e5979b2 100644 --- a/commands/review-pr.md +++ b/commands/review-pr.md @@ -15,6 +15,6 @@ Review the changes and provide feedback on: - Documentation 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 ""` - Leave feedback without merging - **Comment only**: `fj pr comment $1 ""` - Add a comment for discussion