Commit 87e7e09
fix(yarn.lock): restore to release/7.79.0 baseline
The merge of stable into release/7.79.0 used `-X ours` which only
applies "ours" at conflict markers; non-conflicting hunks of yarn.lock
auto-merged from stable, mixing stable's older dependency resolutions
(e.g. @metamask/ramps-controller @14.0.0 dep on assets-controller
@106.x) with release/7.79.0's package.json which expects newer
versions. This made `yarn install --immutable` fail in CI with YN0028
"The lockfile would have been modified by this install".
Replace yarn.lock with origin/release/7.79.0:yarn.lock byte-for-byte.
package.json wasn't changed by the merge (kept --ours), so this pair
is exactly what release/7.79.0 had passing CI before, plus this PR
brings no package.json changes.
Verified locally: `yarn install --immutable` exits 0.
Co-authored-by: Cursor <cursoragent@cursor.com>1 parent d352e35 commit 87e7e09
1 file changed
Lines changed: 5 additions & 17 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
7574 | 7574 | | |
7575 | 7575 | | |
7576 | 7576 | | |
7577 | | - | |
7578 | | - | |
7579 | | - | |
| 7577 | + | |
| 7578 | + | |
| 7579 | + | |
7580 | 7580 | | |
7581 | | - | |
| 7581 | + | |
7582 | 7582 | | |
7583 | 7583 | | |
7584 | 7584 | | |
| |||
9503 | 9503 | | |
9504 | 9504 | | |
9505 | 9505 | | |
9506 | | - | |
9507 | | - | |
9508 | | - | |
9509 | | - | |
9510 | | - | |
9511 | | - | |
9512 | | - | |
9513 | | - | |
9514 | | - | |
9515 | | - | |
9516 | | - | |
9517 | | - | |
9518 | 9506 | | |
9519 | 9507 | | |
9520 | 9508 | | |
| |||
10366 | 10354 | | |
10367 | 10355 | | |
10368 | 10356 | | |
10369 | | - | |
| 10357 | + | |
10370 | 10358 | | |
10371 | 10359 | | |
10372 | 10360 | | |
| |||
0 commit comments