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 <PR_NUMBER> "$(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/<branch>        # resolve conflicts if any
+git push origin main
+tea pr close --login schweitz --repo jpmschweitzer/settled-reach <PR_NUMBER>
+```
+
+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