@sjawhar/pi-legion 19.28.0 → 19.28.1

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/dist/legion.js CHANGED
@@ -29720,7 +29720,7 @@ import { logger as logger3 } from "@oh-my-pi/pi-utils";
29720
29720
  // package.json
29721
29721
  var package_default = {
29722
29722
  name: "@sjawhar/pi-legion",
29723
- version: "19.28.0",
29723
+ version: "19.28.1",
29724
29724
  license: "Apache-2.0",
29725
29725
  type: "module",
29726
29726
  omp: {
@@ -51,9 +51,18 @@ Every path it cites is in cybermonklabs/legion.
51
51
 
52
52
  ```bash
53
53
  base=$(gh pr view <n> -R <owner>/<repo> --json baseRefName -q '.baseRefName | @json') && \
54
- jj -R "$LEGION_WORKSPACE" new legion/<KEY> "${base}@origin" -m "merge: resolve conflict against ${base}@origin"
54
+ jj -R "$LEGION_WORKSPACE" new legion/<KEY> "${base}@origin" -m "<message>"
55
55
  ```
56
56
 
57
+ `<message>` is written in the repository's own commit convention, read from the repository
58
+ itself: its commit-message check (a commitlint configuration or the workflow that lints
59
+ commits) where it has one, else its recent commits on the base. Where it uses Conventional
60
+ Commits, that is a listed type and the merge in words, for example
61
+ `chore(<scope>): merge <base> into <branch>`. Where neither shows a convention, it is the
62
+ merge in words alone, for example `Merge <base> into <branch>`. Never a fixed prefix of the
63
+ skill's own: a check that lints every commit of the pull request refuses a type its list does
64
+ not hold, and `merge` is in no Conventional Commits list.
65
+
57
66
  Merge from the bookmark, never from `@`: a `jj split` leaves `@` an empty, undescribed
58
67
  commit above the described one the bookmark already names, and `jj git push` refuses to push
59
68
  any commit without a description — merging from `@` drags that undescribed commit into the
@@ -66,7 +75,7 @@ Every path it cites is in cybermonklabs/legion.
66
75
  fast-forward and *Rewriting pushed commits* never applies.
67
76
  - **After a retarget.** Retargeting a pull request to a new base does not re-run Tests. Read
68
77
  `base` again and merge the bookmark onto it in one command
69
- (`base=$(gh pr view <n> -R <owner>/<repo> --json baseRefName -q '.baseRefName | @json') && jj -R "$LEGION_WORKSPACE" new legion/<KEY> "${base}@origin" -m "<message>"`) and push it the
78
+ (`base=$(gh pr view <n> -R <owner>/<repo> --json baseRefName -q '.baseRefName | @json') && jj -R "$LEGION_WORKSPACE" new legion/<KEY> "${base}@origin" -m "<message>"`, its `<message>` in the repository's own commit convention, as above) and push it the
70
79
  ordinary way — a genuine fast-forward, never `--allow-backwards` — so the new head runs Tests
71
80
  against the new merge result, and cite that run in the PR body.
72
81
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@sjawhar/pi-legion",
3
- "version": "19.28.0",
3
+ "version": "19.28.1",
4
4
  "license": "Apache-2.0",
5
5
  "type": "module",
6
6
  "omp": {