Skip to content

Commit 48583f8

Browse files
jonathanperisclaude
andcommitted
docs: add sync main steps to development workflow in CLAUDE.md
Explicitly require fetching and pulling main before creating branches and before opening PRs to avoid merge conflicts. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 016ad6f commit 48583f8

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

CLAUDE.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,13 @@ jonathanperis.github.io/
124124

125125
## Development Workflow
126126

127-
1. Create a feature branch from `main`
128-
2. Make changes and push
129-
3. Open a PR targeting `main` — CI runs lint + build automatically
130-
4. After review and green checks, rebase-merge the PR
131-
5. `deploy.yml` triggers automatically on push to main
127+
1. **Sync main first:** `git fetch origin main && git checkout main && git pull origin main`
128+
2. Create a feature branch from `main`
129+
3. Make changes and push
130+
4. **Before opening a PR:** fetch and pull main again to ensure no conflicts
131+
5. Open a PR targeting `main` — CI runs lint + build automatically
132+
6. After review and green checks, rebase-merge the PR
133+
7. `deploy.yml` triggers automatically on push to main
132134

133135
---
134136

0 commit comments

Comments
 (0)