Skip to content

Commit c0a7be3

Browse files
geroplona-agent
andcommitted
Add git workflow and branch naming guidelines
- Add comprehensive feature branch naming convention to systemPatterns.md - Include initials extraction rules and 24-character limit - Add workflow steps with git config user.name requirement - Add reference to branch naming guidelines in CLAUDE.md - Ensure all future AI sessions follow consistent branch naming Co-authored-by: Ona <[email protected]>
1 parent 3145c9d commit c0a7be3

File tree

2 files changed

+22
-0
lines changed

2 files changed

+22
-0
lines changed

CLAUDE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ The `memory-bank/components/` directory contains detailed documentation for each
2727
2. **Component-specific work** - Refer to the relevant component documentation in `memory-bank/components/`
2828
3. **Architecture decisions** - Check `memory-bank/systemPatterns.md` for established patterns and conventions
2929
4. **Current focus** - Review `memory-bank/activeContext.md` for ongoing work and priorities
30+
5. **Git workflow** - **CRITICAL**: Always use feature branches with proper naming convention (see `memory-bank/systemPatterns.md` for branch naming rules)
3031

3132
## Key Characteristics
3233

memory-bank/systemPatterns.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,27 @@ Gitpod follows a microservices architecture designed to be **Scalable**, **Resil
112112

113113
## Development Workflows
114114

115+
### Git Branch Management
116+
117+
#### Feature Branch Naming Convention
118+
**CRITICAL**: Always use feature branches from main for all work. Never work directly on main.
119+
120+
**Naming Pattern**: `[initials]/[[issue-id]-][topic-shorthand]`
121+
122+
**Rules**:
123+
- **Maximum 24 characters total**
124+
- **Initials**: Extract from `git config user.name` (first letter of each word)
125+
- **Issue ID**: Numeric part only (e.g., "1592" from "CLC-1592")
126+
- **Topic**: 2-3 words separated by dashes, describing the work
127+
- **IMPORTANT**: Always run `git config user.name` first - never assume initials
128+
129+
**Workflow**:
130+
1. Run `git config user.name` to get actual name
131+
2. Extract initials from the output
132+
3. Create feature branch: `git checkout -b [initials]/[topic]`
133+
4. Push work to feature branch
134+
5. Create PR against main
135+
115136
### PRD Workflow
116137
1. **Requirements Gathering** (Plan): Understand problem, explore components
117138
2. **PRD Creation** (Plan): Create document with standardized sections

0 commit comments

Comments
 (0)