From 10a9654674ada22e62d1ebeef78f74a151ac27bc Mon Sep 17 00:00:00 2001 From: Peter Steinberger Date: Thu, 30 Apr 2026 02:00:00 +0100 Subject: [PATCH] docs: update clawsweeper automerge workflow --- .agents/skills/clawsweeper/SKILL.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.agents/skills/clawsweeper/SKILL.md b/.agents/skills/clawsweeper/SKILL.md index 96643e16ca7..c1a3370a2d6 100644 --- a/.agents/skills/clawsweeper/SKILL.md +++ b/.agents/skills/clawsweeper/SKILL.md @@ -261,6 +261,20 @@ If ClawSweeper passes while merge gates are closed, it labels `clawsweeper:merge-ready` and comments instead of merging. `@clawsweeper stop` adds `clawsweeper:human-review`. +When Peter asks Codex to create a PR and enable ClawSweeper automerge, do not +leave his local OpenClaw checkout on the PR branch. After the PR is created, +pushed, and the `@clawsweeper automerge` request is posted or otherwise +confirmed, return the local checkout to `main` and fast-forward it when the +working tree is clean: + +```bash +git switch main +git pull --ff-only +``` + +If unrelated local edits or an in-progress rebase prevent switching, report the +blocker instead of stashing, deleting, or overwriting work. + Repair caps: ```bash