fix(merge): drop worktree cleanup step
The aoe-ownership check and its warning were noise on every merge; cleanup is the user's call. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
+2
-19
@@ -47,22 +47,5 @@ instead — checkout the default branch, `git merge <branch> --no-edit`, push.
|
||||
|
||||
# Cleanup
|
||||
|
||||
Check whether Agent of Empires owns this worktree first. `aoe session current`
|
||||
resolves from the tmux environment, not the cwd, so confirm the session's `Path`
|
||||
is actually this worktree:
|
||||
|
||||
```
|
||||
S=$(aoe session current -q) && aoe session show "$S" | grep Path
|
||||
```
|
||||
|
||||
- **The path matches this worktree** → aoe owns the worktree and the branch. Do not
|
||||
run `git worktree remove` or delete the branch; that strands the session and
|
||||
deletes the directory you are running in. Report the merge, then hand me the
|
||||
command and stop:
|
||||
|
||||
```
|
||||
aoe remove <session> --delete-worktree --delete-branch
|
||||
```
|
||||
|
||||
- **No session, or the path points elsewhere** → the worktree is plain git.
|
||||
Delete the local worktree and branch yourself.
|
||||
None. Never remove the worktree or delete the branch, and never check who owns
|
||||
them — I handle cleanup myself. Report the merge and stop.
|
||||
|
||||
Reference in New Issue
Block a user