chore(skills): add merge workflow and heredoc workaround to review-pr
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 <noreply@anthropic.com>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user