Skip to content

Commit 0e9a543

Browse files
committed
Edit git workflow
1 parent ba5b00d commit 0e9a543

1 file changed

Lines changed: 24 additions & 0 deletions

File tree

CLAUDE.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,30 @@ Build Atlas as a production-quality, Telegram-first planning assistant. The code
118118
- Do not commit or push implementation work directly to `main`.
119119
- If work is accidentally committed on `main`, move it to a feature branch before pushing.
120120

121+
- **Every workflow - no exceptions - must use a dedicated branch.**
122+
- Create a branch before making changes:
123+
git switch -c claude/<short-description>
124+
- Do not perform implementation work directly on `main`.
125+
126+
- **Use a git worktree when work may run in parallel or overlap.**
127+
- Examples: concurrent tasks, long-running edits, formatting passes, refactors, or agent-driven work.
128+
- Create the worktree before touching files:
129+
git worktree add .worktrees/atlas-<short-description> -b claude/<short-description>
130+
- All edits and commits for that workflow must happen inside that worktree, never in the main checkout.
131+
132+
- **Direct commits or merges to `main` are not allowed by default.**
133+
- All changes must land via a dedicated branch.
134+
- Prefer PR-based merges, even for small changes.
135+
- Fast-forward merges from a clean branch are acceptable after work is complete.
136+
137+
- Follow `docs/workflows/feature-delivery.md` for product features, fixes, and behavior changes.
138+
139+
- If work is accidentally committed on `main`, move it to a feature branch before pushing.
140+
141+
- Remove temporary worktrees after merge:
142+
- git worktree remove .worktrees/atlas-<short-description>
143+
- git branch -d claude/<short-description> (if fully merged)
144+
121145
## Execution Rules
122146

123147
- Before finishing, run the narrowest relevant checks for the touched code.

0 commit comments

Comments
 (0)