Skip to content

Commit 6abfd90

Browse files
authored
Merge pull request #2481 from mroderick/docs/improve-workflow-documentation
docs: clarify branch-based workflow requirements
2 parents 5c9c428 + cc0c126 commit 6abfd90

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

CLAUDE.md

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,23 @@ This file provides guidance to Claude Code (claude.ai/code) when working with co
66

77
codebar planner is a Rails 8.1 application for managing [codebar.io](https://codebar.io) members and events. It handles workshop/event scheduling, member registration, invitations, RSVPs, and feedback collection for coding workshops organized by codebar chapters.
88

9+
## Development Workflow
10+
11+
**CRITICAL**: Never work directly on the `master` branch. All changes must be made via pull requests from feature branches.
12+
13+
### Branching Strategy
14+
15+
1. **Create a feature branch** from `master`: `git checkout -b feature/descriptive-name`
16+
2. **Make your changes** and commit them to the feature branch
17+
3. **Push the branch** to the remote repository
18+
4. **Create a pull request** for review
19+
5. **Wait for approval** before merging to `master`
20+
21+
**Never:**
22+
- Commit directly to `master`
23+
- Push directly to `master`
24+
- Merge without review
25+
926
## Development Setup
1027

1128
**IMPORTANT**: Always use native installation with `bundle exec` commands. Never use Docker or `bin/d*` commands.
@@ -33,15 +50,6 @@ GITHUB_SECRET=<your_github_oauth_client_secret>
3350

3451
Create GitHub OAuth app at https://github.com/settings/applications/new with callback URL `http://localhost:3000/auth/github`.
3552

36-
## Development Workflow
37-
38-
**IMPORTANT**: All changes to this project must be made via pull requests. Never commit directly to the `master` branch.
39-
40-
1. Create a feature branch from `master`
41-
2. Make your changes and commit them to the feature branch
42-
3. Push the branch and create a pull request
43-
4. Wait for review and approval before merging
44-
4553
## Architecture & Domain Model
4654

4755
### Core Domain Concepts

0 commit comments

Comments
 (0)