From a2c77a338bb238cd8dfc38de556b8a017e458165 Mon Sep 17 00:00:00 2001 From: Hugo Nijhuis Date: Thu, 1 Jan 2026 19:11:13 +0100 Subject: [PATCH] Add merging documentation to review-pr command MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Document tea pulls merge as the correct merge method - Add warning against using Gitea API with admin credentials - Document tea comment as alternative to interactive tea pulls review 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 --- commands/review-pr.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/commands/review-pr.md b/commands/review-pr.md index aeedeae..3c96b76 100644 --- a/commands/review-pr.md +++ b/commands/review-pr.md @@ -20,3 +20,19 @@ Ask the user what action to take: - **Merge**: Post review summary as comment, then merge with rebase style - **Request changes**: Leave feedback without merging - **Comment only**: Add a comment for discussion + +## Merging + +Always use tea CLI for merges to preserve user attribution: + +```bash +tea pulls merge --style rebase +``` + +For review comments, use `tea comment` since `tea pulls review` is interactive-only: + +```bash +tea comment "" +``` + +> **Warning**: Never use the Gitea API with admin credentials for user-facing operations like merging. This causes the merge to be attributed to the admin account instead of the user.