@@ -75,16 +75,16 @@ On macOS pass `gsed` as the 2nd arg (the script auto-detects, but be explicit).
7575The script: fetches upstream, builds ` bump/primer-upstream-ref ` (reset to the
7676SHA) and ` bump/primer-upstream ` (from ` origin/main ` ), merges with ` --no-commit ` ,
7777rescopes ` @primer/view-components ` → ` @openproject/primer-view-components ` in
78- ` .changeset/*.md ` , then runs ` . /setup` , stages, and stops at an interactive
78+ ` .changeset/*.md ` , then runs ` script /setup` , stages, and stops at an interactive
7979` git commit ` .
8080
81- ** The merge step is conflict-tolerant (` || true ` ), but the later ` . /setup` is
82- not.** ` . /setup` runs ` bundle install ` and ` npm install ` ; when a ` Gemfile ` ,
81+ ** The merge step is conflict-tolerant (` || true ` ), but the later ` script /setup` is
82+ not.** ` script /setup` runs ` bundle install ` and ` npm install ` ; when a ` Gemfile ` ,
8383` *.gemspec ` , or ` package.json ` conflicts (almost always — fork scope/version vs
8484upstream), the conflict markers make those installs fail → ` set -e ` aborts the
8585script * before* stage/commit. That's expected: the changeset rescope has already
8686run, and you're left mid-merge. ** Resolve conflicts (step 3) first, then run
87- ` . /setup` yourself** , then stage and commit.
87+ ` script /setup` yourself** , then stage and commit.
8888
8989### 3. Resolve conflicts by package manager
9090
@@ -98,16 +98,16 @@ automatically (fork wins). For the rest:
9898| ` package.json ` (root or ` demo/ ` ) | ** npm** | Resolve ` package.json ` , then ` npm install ` in that dir to regenerate ` package-lock.json ` |
9999| component source, ` .changeset/*.md ` , ` previews/ ` , docs | — | Resolve normally; keep upstream's new components |
100100
101- ` . /setup` does both (` bundle install ` + ` npm install ` , root and ` demo/ ` , then
102- ` rake docs:build ` ), so once conflicts are resolved a single ` . /setup` refreshes
101+ ` script /setup` does both (` bundle install ` + ` npm install ` , root and ` demo/ ` , then
102+ ` rake docs:build ` ), so once conflicts are resolved a single ` script /setup` refreshes
103103every lockfile and the generated docs. The mirror repo (octicons) instead uses
104104yarn at the root plus npm for ` octicons_angular ` .
105105
106106After resolving, re-stage, run setup, and commit:
107107
108108``` bash
109109git add -A
110- . /setup # regenerates lockfiles + docs from the merged sources
110+ script /setup # regenerates lockfiles + docs from the merged sources
111111git add -A
112112git commit # finishes the deferred merge commit
113113```
@@ -122,7 +122,7 @@ for vp in $(git log upstream/main --grep="Release tracking" --not main --reverse
122122done
123123script/merge-upstream < TARGET> gsed
124124# resolve conflicts: Gemfile→bundle install, package.json→npm install, others normal
125- . /setup && git add -A && git commit
125+ script /setup && git add -A && git commit
126126```
127127
128128## Common Mistakes
@@ -160,7 +160,7 @@ differences to account for:
160160 ` Version Packages ` (octicons).
161161- ** Package managers / lockfiles:** view_components uses Ruby Bundler
162162 (` Gemfile.lock ` , ` demo/Gemfile.lock ` ) plus npm (` package-lock.json ` ,
163- ` demo/package-lock.json ` ), driven by ` . /setup` ; octicons uses yarn at the root
163+ ` demo/package-lock.json ` ), driven by ` script /setup` ; octicons uses yarn at the root
164164 plus npm for ` octicons_angular ` .
165165- ** npm scope:** ` @primer/view-components ` → ` @openproject/primer-view-components `
166166 (octicons: ` @primer/octicons ` → ` @openproject/octicons ` ).
0 commit comments