From 7d9cf75399ab6a8dd2642e8d32a713b475b6cb80 Mon Sep 17 00:00:00 2001 From: Mykhailo Chalyi Date: Fri, 13 Mar 2026 20:18:19 -0500 Subject: [PATCH] docs: clarify latest-main requirement for worktrees --- AGENTS.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/AGENTS.md b/AGENTS.md index 64c3fa2..0c9d535 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -2,6 +2,8 @@ This repo is intended to be runnable locally and easy for coding agents to work in. +Always make sure you are working on top of latest main from remote. Especially in detached worktrees, fetch `origin/main` and rebase or branch from it before editing. + Style Telegraph. Drop filler/grammar. Min tokens (global AGENTS + replies). @@ -178,7 +180,7 @@ doppler run -- bash -lc 'GH_TOKEN="$GITHUB_TOKEN" gh auth status' Before creating a pull request, ensure: -1. **Branch rebased**: Rebase on latest main to avoid merge conflicts +1. **Branch rebased**: Rebase on latest main to avoid merge conflicts. In detached worktrees, first create or switch to a topic branch that is based on `origin/main`. ```bash git fetch origin main && git rebase origin/main ```