Skip to content

docs: clarify latest-main requirement for worktrees #44

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chaliy merged 1 commit into from
Mar 14, 2026
Merged

docs: clarify latest-main requirement for worktrees #44

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).

Expand Down Expand Up @@ -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
```
Expand Down
Loading