Skip to content

Commit 324e014

Browse files
committed
chore: require default-branch pre-commit guardrail
1 parent b363216 commit 324e014

1 file changed

Lines changed: 5 additions & 0 deletions

File tree

  • skills/branching-strategy-and-conventions

skills/branching-strategy-and-conventions/SKILL.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ commits, safe merges, and explicit handling for parallel work.
2929
- Merge commits are used for integration.
3030
- Commit messages are non-conventional or verbose.
3131
- Commit message rules are documented but not enforced by hooks or CI.
32+
- Local hooks allow commits on the default branch.
3233
- Feature branches lack traceability to tickets/issues when available.
3334
- Parallel work on a feature branch is done without isolated task branches.
3435

@@ -39,6 +40,7 @@ commits, safe merges, and explicit handling for parallel work.
3940
- All work lands via feature branches (no direct commits to `main`).
4041
- Integration uses fast-forward or rebase-only merges (no merge commits).
4142
- Conventional commits are enforced with concise titles and descriptions.
43+
- Local hooks block commits to the default branch.
4244
- Ticket/issue identifiers are included when available.
4345
- Parallel tasks use transient task branches and merge back after verification.
4446

@@ -55,6 +57,7 @@ commits, safe merges, and explicit handling for parallel work.
5557
- Parallel work uses transient task branches per worktree.
5658
3. **Implementation**:
5759
- Configure a `commit-msg` hook and CI to block non-conventional commits.
60+
- Add a `pre-commit` hook to block commits on the default branch.
5861
- Enforce merge policy via branch protection or repo settings.
5962
- Document branch naming and ticket linkage expectations.
6063
4. **Verification**: Demonstrate a conventional commit is accepted and a
@@ -70,6 +73,7 @@ commits, safe merges, and explicit handling for parallel work.
7073

7174
- A feature branch merge succeeds only with rebase/fast-forward and a
7275
conventional commit message.
76+
- A commit attempt on the default branch is blocked by the pre-commit hook.
7377

7478
---
7579

@@ -80,6 +84,7 @@ commits, safe merges, and explicit handling for parallel work.
8084
- Missing ticket identifiers when issues exist.
8185
- Reusing a single branch for parallel tasks without isolation.
8286
- Relying on documentation alone instead of automated enforcement.
87+
- Bypassing local hooks to commit on the default branch.
8388

8489
---
8590

0 commit comments

Comments
 (0)