curo/Pyra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

docs: require git worktrees for all branch work

Browse Source 
Adds a Workflow Rules section mandating worktrees so parallel plugin and
feature sessions never interfere with each other or with main. Includes
setup commands, rules, and updated Plugin Branches section.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
curo1305
2026-05-18 15:29:58 +02:00
parent 800b1e9494
commit 928724ba39
1 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CLAUDE.md
+32 -2
View File
@@ -261,13 +261,43 @@ chore: description
- Always `git add` only the files relevant to that commit — never `git add .` blindly. - Always `git add` only the files relevant to that commit — never `git add .` blindly.
- **Always push after committing** — every commit goes to the remote Gitea repository immediately. - **Always push after committing** — every commit goes to the remote Gitea repository immediately.
### Git Worktrees — Required for All Branch Work
**Never switch branches in the main working directory.** Always use a git worktree so that
multiple sessions (plugins, features, bugfixes) can run in parallel without interfering with
each other or with `main`.
```bash
# Create a worktree for a plugin branch
git worktree add ../pyra-plugin-nextcloud -b plugin/nextcloud
# Create a worktree for a feature branch
git worktree add ../pyra-feat-vault -b feat/vault-encryption
# List active worktrees
git worktree list
# Remove a worktree after merging
git worktree remove ../pyra-plugin-nextcloud
```
Each worktree is a full checkout at a separate path. Work on it exactly like the main repo —
commit, push, run tests — without touching the `main` worktree.
**Rules:**
- The main working directory (`/Users/nik/Documents/Progamming/pyra`) always stays on `main`.
- Do **not** run `git checkout <branch>` in the main directory — create a worktree instead.
- When a Claude Code session is asked to work on a branch, it must create (or reuse) a worktree
for that branch before making any changes.
### Plugin Branches ### Plugin Branches
- Every plugin is developed on its own branch: `plugin/<name>` (e.g. `plugin/nextcloud`). - Every plugin is developed on its own branch: `plugin/<name>` (e.g. `plugin/nextcloud`), in its
own worktree (e.g. `../pyra-plugin-nextcloud`).
- A plugin branch is **never merged to `main` until the plugin is complete and tested**. - A plugin branch is **never merged to `main` until the plugin is complete and tested**.
- `main` always contains only production-ready core source code (`src/pyra/` framework). - `main` always contains only production-ready core source code (`src/pyra/` framework).
- If plugin work uncovers a bug in core Pyra code, fix it on a dedicated `fix/...` branch - If plugin work uncovers a bug in core Pyra code, fix it on a dedicated `fix/...` branch
off `main`, commit it to `main`, push, then rebase the plugin branch onto the updated `main`. off `main` (in its own worktree), merge to `main`, push, then rebase the plugin branch.
- Plugin branches may be pushed to remote for backup/review at any time. - Plugin branches may be pushed to remote for backup/review at any time.
- Do **not** merge plugin branches to `main` prematurely — a half-working plugin on `main` - Do **not** merge plugin branches to `main` prematurely — a half-working plugin on `main`
is worse than one that isn't there yet. is worse than one that isn't there yet.