opencode agents

2026-02-07 14:13:48 +00:00
parent 3ba8564194
commit 682bb61037
23 changed files with 6622 additions and 0 deletions
@@ -0,0 +1,23 @@
+---
+description: Merge a worktree branch back into the base branch
+---
+Merge a branch from the worktree.
+If you're currently working on a worktree, assume that's the one I'm referring to.
+
+Start by committing any staged and unstaged changes. I may have made changes to the worktree manually.
+Then merge back the new main branch, since I may have made changes to it.
+
+# Language specific:
+
+## Rust
+
+Ensure cargo check is happy.
+Ensure clippy is happy. clean up any new warnings.
+
+## Typescript
+
+Ensure tsc is happy.
+
+# Finally
+
+Squash the commits into a single one, merge into the base branch, and delete the worktree.