Work>work chooses its own task and merges from the interface; panes find their tools; shell follows the project folder
This commit is contained in:
@@ -86,24 +86,33 @@ Go to `Work>work`. It follows the task you chose on the board.
|
||||
|
||||
## Step 4 — merge it
|
||||
|
||||
This is the one step that needs a shell, because a merge takes a lock and re-runs the checks.
|
||||
No terminal. Stay in `Work>work`.
|
||||
|
||||
1. Go to `Shell>shell`. You are in the project folder.
|
||||
2. Type: `bin/merge AUD-1xx --check` (your identifier), press `Enter`.
|
||||
1. Press `m`. The **merge** tab opens by itself and shows what is happening:
|
||||
|
||||
**Expected:** it rebases, runs the review, and prints either `checked only; nothing merged` or
|
||||
`no verify command: this would pass on the agent's word` followed by the same. Both are normal:
|
||||
nothing is merged yet.
|
||||
```
|
||||
merge of AUD-1xx started 12:01:39
|
||||
rebased onto main
|
||||
no verify command: this would pass on the agent's word
|
||||
review saw nothing to review (0 files); recorded, not hidden
|
||||
merged into main at 4a44473
|
||||
merge finished 12:01:43
|
||||
```
|
||||
|
||||
3. Type: `bin/merge AUD-1xx`, press `Enter`.
|
||||
2. Wait for `merged into main at <commit>`. That commit is the task's work, on the project's
|
||||
base branch.
|
||||
|
||||
**Expected:** the same checks, then `merged into main at <commit>`. A review that finds
|
||||
something serious refuses the merge and says so; that is the gate working, not a failure.
|
||||
**Expected:** a green refusal line, not a red one. If it says `refused: the review found 1
|
||||
blocking item(s)`, the gate worked — the findings are on the task and in `Work>review`.
|
||||
|
||||
4. Type `git log --oneline -3`, press `Enter`. Your task's merge commit is at the top.
|
||||
**Starting a merge twice by accident is safe**: the merge takes a lock and the second one is
|
||||
refused with `another merge is in progress`.
|
||||
|
||||
**Stop if:** it says `refused`. The reason is printed and also written on the task, where
|
||||
`Work>review` shows it.
|
||||
## Step 4b — choose a task without leaving Work
|
||||
|
||||
In `Work>work`, press `o`. A list of this project's tasks appears. `↑`/`↓` to one, `Enter`, and
|
||||
the runs, change, facts, review and merge tabs all switch to it. You never have to go to
|
||||
`Board>board` first.
|
||||
|
||||
## Step 5 — a task that must wait for another
|
||||
|
||||
|
||||
@@ -37,6 +37,7 @@ what it shows is never a second copy of anything.
|
||||
| `Work>change` | worktree, branch, base, commits, changed files, the diff | built |
|
||||
| `Work>facts` | task, state, worktree path, branch, base, cost | built |
|
||||
| `Work>review` | the verdicts recorded on this task: review findings, refused merges, merged results, blocking ones in red | built |
|
||||
| `Work>merge` | the last merge this screen ran, live, with `m` to start one — no terminal needed | built |
|
||||
|
||||
## 4. Reply
|
||||
|
||||
|
||||
Reference in New Issue
Block a user