chore(docs): document local branch-merge-push git workflow
This commit is contained in:
13
CLAUDE.md
13
CLAUDE.md
@@ -38,6 +38,19 @@ Monorepo at `gitlab.com/vikingowl/marktvogt.de`. Components are regular director
|
||||
- **Veranstalter** is the central role — creates markets, manages plots, reviews applications, configures tickets.
|
||||
- **Mitarbeiter** (staff) is a sub-role under Veranstalter with granular permissions.
|
||||
|
||||
## Git Workflow
|
||||
|
||||
When asked to "commit to a new branch, merge to main, and push":
|
||||
|
||||
```bash
|
||||
git checkout -b <branch-name>
|
||||
git add <files>
|
||||
git commit -m "<message>"
|
||||
git checkout main && git merge --ff-only <branch-name> && git push origin main && git branch -d <branch-name>
|
||||
```
|
||||
|
||||
No MR/PR needed for this pattern — merge locally, push main directly.
|
||||
|
||||
## Development Conventions
|
||||
|
||||
- All planning docs use ASCII (no umlauts) for cross-platform compatibility.
|
||||
|
||||
Reference in New Issue
Block a user