@webpieces/rules-config 0.4.502 → 0.4.504
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@webpieces/rules-config",
|
|
3
|
-
"version": "0.4.
|
|
3
|
+
"version": "0.4.504",
|
|
4
4
|
"description": "Shared webpieces.config.json loader. Single source of truth for validation rule configuration consumed by @webpieces/ai-hook-rules, @webpieces/code-rules, and @webpieces/nx-webpieces-rules.",
|
|
5
5
|
"type": "commonjs",
|
|
6
6
|
"main": "./src/index.js",
|
|
@@ -253,8 +253,10 @@ you: pnpm wp-start-update
|
|
|
253
253
|
Who does what on the conflict path:
|
|
254
254
|
- **You/the AI** supply the *judgment*: how to combine the conflicting changes. You edit the files,
|
|
255
255
|
`git add` them, and write each `merge-explanation.md`.
|
|
256
|
-
- **The tool** still makes the *commit*. You are BLOCKED from `git commit` / `git push` / `
|
|
257
|
-
while the merge is in progress (the
|
|
256
|
+
- **The tool** still makes the *commit*. You are BLOCKED from `git commit` / `git push` / `git merge` /
|
|
257
|
+
`git rebase` / `gh pr create|edit|merge` while the merge is in progress (the
|
|
258
|
+
`merge-in-progress-guard`). `git add` is **not** blocked — staging your resolutions is your job, and
|
|
259
|
+
the gate refuses to finish while git still reports unmerged files. Your flow's finish command
|
|
258
260
|
(`wp-finish-update`, or `wp-finish-upsert-pr` in the PR flow) is what validates and commits. `git add -u` stages only your tracked resolutions and **refuses** if any
|
|
259
261
|
untracked file is present — commit or delete those first, the tool will not sweep them in.
|
|
260
262
|
|