Commit 9b878a4
committed
fix(scaffold): drop guard-main-merge hook so end users can merge to main locally
This hook prompted on every 'git merge' and every 'git push ... main'
through Claude's Bash tool. That matches the framework dev's preference
for a strict GitHub-PR-only workflow, but it is the wrong default for
end users. Scaffolded webjs apps may use GitLab, Bitbucket, plain git,
or just merge locally without a forge at all.
End-user enforcement against main is now layered as:
* .hooks/pre-commit (tool-agnostic) blocks direct commits to main
* .claude/hooks/guard-branch-context.sh prompts before editing on main
Both of those work with any git workflow including local merges and
direct pushes to main. The framework repo keeps its own copy of the
merge guard if the user wants to formalize their PR-only workflow
there.1 parent c63dacb commit 9b878a4
3 files changed
Lines changed: 1 addition & 55 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
267 | 267 | | |
268 | 268 | | |
269 | 269 | | |
270 | | - | |
271 | 270 | | |
272 | 271 | | |
273 | 272 | | |
| |||
295 | 294 | | |
296 | 295 | | |
297 | 296 | | |
298 | | - | |
| 297 | + | |
299 | 298 | | |
300 | 299 | | |
301 | 300 | | |
| |||
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
13 | | - | |
14 | | - | |
15 | | - | |
16 | | - | |
17 | | - | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | 13 | | |
23 | 14 | | |
24 | 15 | | |
| |||
0 commit comments