From 36e80900bb0417b38efcb1617e25b3b53a82cf7f Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Thu, 1 Oct 2026 01:08:02 -0400 Subject: [PATCH] =?UTF-8?q?docs:=20AGENTS.md=20=E2=80=94=20merge=20agent?= =?UTF-8?q?=20branches=20one=20at=20a=20time=20with=20CI=20in=20between?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: Claude Opus 5.5 --- AGENTS.md | 3 +++ CLAUDE.md | 3 +++ 2 files changed, 6 insertions(+) diff --git a/AGENTS.md b/AGENTS.md index b8dfdba5c..40f492c7e 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -9,6 +9,9 @@ LightCraft is a clean-room, open-source, pure-Rust photo library + non-destructi `plan/` is gitignored (local-only). +**Merging agent branches:** merge one branch, run `cargo xtask ci`, fix, commit — then the next. Two individually green +branches can still break each other (e.g. a new struct field vs. a new constructor). + **Resuming after a crash / another session:** check `git status` on main, `git worktree list`, and each worktree's `git log main..HEAD` + `git status` for unmerged commits or uncommitted work before starting anything new. Commit small and often so a crash loses minutes, not hours. diff --git a/CLAUDE.md b/CLAUDE.md index b8dfdba5c..40f492c7e 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -9,6 +9,9 @@ LightCraft is a clean-room, open-source, pure-Rust photo library + non-destructi `plan/` is gitignored (local-only). +**Merging agent branches:** merge one branch, run `cargo xtask ci`, fix, commit — then the next. Two individually green +branches can still break each other (e.g. a new struct field vs. a new constructor). + **Resuming after a crash / another session:** check `git status` on main, `git worktree list`, and each worktree's `git log main..HEAD` + `git status` for unmerged commits or uncommitted work before starting anything new. Commit small and often so a crash loses minutes, not hours.