tomevault-io Git Workflows
Best practices for git branching and collaboration.
Devloop Integration
Configure git workflow in .devloop/local.md:
---
git:
auto-branch: true # Create branch when plan starts
branch-pattern: "feat/{slug}"
pr-on-complete: ask # ask | always | never
---
Related commands:
/devloop:ship- Commit with plan context, create PR/devloop:pr-feedback- Integrate review comments
Branch Naming
<type>/<ticket>-<description>
feat/AUTH-123-add-oauth
fix/BUG-456-null-pointer
feat/add-authentication (devloop default)
Trunk-Based Development (Recommended)
Modern approach favored by high-performing teams:
- Short-lived feature branches (hours to days)
- Frequent merges to main via PRs
- Strong CI/CD pipeline
- Feature flags for incomplete work
Devloop fit: Plan → Branch → Implement → Ship → PR
Conventional Commits
<type>(<scope>): <description>
feat(auth): add OAuth2 login support
fix(api): handle null response
refactor(utils): extract date formatting
| Type | Description |
|---|---|
| feat | New feature (MINOR) |
| fix | Bug fix (PATCH) |
| docs | Documentation |
| refactor | Code restructure |
| test | Tests |
| chore | Maintenance |
Devloop auto-generates commit messages from plan tasks using conventional format.
PR Workflow
- Create branch when starting plan
- Commit as you complete tasks
- Run
/devloop:shipwhen ready - Address feedback with
/devloop:pr-feedback - Push fixes and re-request review
Merge Strategies
- Merge commit: Preserve full history
- Squash merge: Clean linear history (recommended for feature PRs)
- Rebase merge: Linear, preserves commits
Safety Rules
Never on shared branches:
- Force push
- Rebase after push
- Reset after push
Converted and distributed by TomeVault — claim your Tome and manage your conversions.