From 8cc6167bd96875f58c1833a543021ae41a4fac41 Mon Sep 17 00:00:00 2001 From: Jeroen Schweitzer Date: Wed, 11 Feb 2026 18:22:14 +0100 Subject: [PATCH] chore(skills): add merge workflow and heredoc workaround to review-pr MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Document that tea pr merge fails (405) on conflicting branches, requiring local merge + tea pr close. Also note heredoc hanging issue with tea comment — use temp file instead. Co-Authored-By: Claude Opus 4.6 --- .claude/skills/review-pr/SKILL.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/.claude/skills/review-pr/SKILL.md b/.claude/skills/review-pr/SKILL.md index 6c904cada..51c92ed2e 100644 --- a/.claude/skills/review-pr/SKILL.md +++ b/.claude/skills/review-pr/SKILL.md @@ -157,6 +157,27 @@ REVIEW Note: `tea pr reject` does not work on your own PRs. Use `tea comment` instead. +**Heredoc bodies hang** in `tea comment`. Write review to a temp file instead: +```bash +# Write review to temp file, then pass via cat +tea comment --login schweitz --repo jpmschweitzer/settled-reach "$(cat /tmp/review.md)" +``` + +## Merging approved PRs + +`tea pr merge` fails (405) when branches have conflicts with main. Merge +locally instead: + +```bash +git fetch --all +git merge origin/ # resolve conflicts if any +git push origin main +tea pr close --login schweitz --repo jpmschweitzer/settled-reach +``` + +Gitea does **not** auto-close PRs when you push a local merge — always close +manually with `tea pr close` after pushing. + ## Tips from practice - **Vendor code**: Explicitly note vendor code in the prompt so reviewers focus