merge: resolve conflicts with origin/main (v0.6.4.1)

This commit is contained in:
Garry Tan
2026-03-18 06:08:02 -07:00
27 changed files with 79 additions and 16 deletions
+1 -1
View File
@@ -2,7 +2,7 @@
name: ship
version: 1.0.0
description: |
Ship workflow: detect + merge base branch, run tests, review diff, bump VERSION, update CHANGELOG, commit, push, create PR.
Ship workflow: detect + merge base branch, run tests, review diff, bump VERSION, update CHANGELOG, commit, push, create PR. Use when asked to "ship", "deploy", "push to main", "create a PR", or "merge and push".
allowed-tools:
- Bash
- Read
+1 -1
View File
@@ -2,7 +2,7 @@
name: ship
version: 1.0.0
description: |
Ship workflow: detect + merge base branch, run tests, review diff, bump VERSION, update CHANGELOG, commit, push, create PR.
Ship workflow: detect + merge base branch, run tests, review diff, bump VERSION, update CHANGELOG, commit, push, create PR. Use when asked to "ship", "deploy", "push to main", "create a PR", or "merge and push".
allowed-tools:
- Bash
- Read