Fixes merge conflict resolution always querying the network (#5504)

**What's the problem this PR addresses?**

I broke part of the automatic conflict resolution in #5102 - a code
supposed to make Yarn update the lockfile metadata when merging
incompatible lockfile versions was incorrectly causing Yarn to do that
for each merge conflict resolution. It can be very frustrating when the
project includes some dependencies that cannot be easily pulled from the
registry (for example when they are a npm git repo which doesn't build
anymore due to ERESOLVE 😄).

**How did you fix it?**

Fix the code to remove the `0` from `Math.min(0, ...)` which was
obviously causing the version to always be `0`.

**Checklist**
<!--- Don't worry if you miss something, chores are automatically
tested. -->
<!--- This checklist exists to help you remember doing the chores when
you submit a PR. -->
<!--- Put an `x` in all the boxes that apply. -->
- [x] I have read the [Contributing
Guide](https://yarnpkg.com/advanced/contributing).

<!-- See
https://yarnpkg.com/advanced/contributing#preparing-your-pr-to-be-released
for more details. -->
<!-- Check with `yarn version check` and fix with `yarn version check
-i` -->
- [x] I have set the packages that need to be released for my changes to
be effective.

<!-- The "Testing chores" workflow validates that your PR follows our
guidelines. -->
<!-- If it doesn't pass, click on it to see details as to what your PR
might be missing. -->
- [x] I will check that all automated PR checks pass before the PR gets
reviewed.

Author: arcanis

.yarn/versions/2c3690ed.yml

@@ -0,0 +1,23 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/plugin-essentials": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/core"
+  - "@yarnpkg/doctor"

packages/acceptance-tests/pkg-tests-specs/sources/features/__snapshots__/mergeConflictResolution.test.js.snap

@@ -195,3 +195,52 @@ exports[`Features Merge Conflict Resolution it should support fixing rebase conf
 ",
 }
 `;
+
+exports[`Features Merge Conflict Resolution it shouldn't re-fetch the lockfile metadata when performing simple merge conflict resolutions 1`] = `
+"# This file is generated by running "yarn install" inside your project.
+# Manual changes might be lost - proceed with caution!
+
+__metadata:
+  version: 7
+  cacheKey: 0
+
+"no-deps@npm:*":
+<<<<<<< HEAD
+  version: 1.0.0
+  resolution: "no-deps@npm:1.0.0"
+  checksum: <checksum stripped>
+=======
+  version: 2.0.0
+  resolution: "no-deps@npm:2.0.0"
+  checksum: <checksum stripped>
+>>>>>>> 2.0.0
+  languageName: node
+  linkType: hard
+
+"root-workspace-0b6124@workspace:.":
+  version: 0.0.0-use.local
+  resolution: "root-workspace-0b6124@workspace:."
+  dependencies:
+    no-deps: "npm:*"
+  languageName: unknown
+  linkType: soft
+"
+`;
+
+exports[`Features Merge Conflict Resolution it shouldn't re-fetch the lockfile metadata when performing simple merge conflict resolutions 2`] = `
+{
+  "code": 0,
+  "stderr": "",
+  "stdout": "➤ YN0048: Automatically fixed merge conflicts 👍
+
+➤ YN0000: ┌ Resolution step
+➤ YN0000: └ Completed
+➤ YN0000: ┌ Fetch step
+➤ YN0019: │ no-deps-npm-2.0.0-8c4f3f8395-9c77ddf9a6.zip appears to be unused - removing
+➤ YN0000: └ Completed
+➤ YN0000: ┌ Link step
+➤ YN0000: └ Completed
+➤ YN0000: Done
+",
+}
+`;

packages/acceptance-tests/pkg-tests-specs/sources/features/mergeConflictResolution.test.js

@@ -194,5 +194,50 @@ describe(`Features`, () => {
         },
       ),
     );
+
+    test(
+      `it shouldn't re-fetch the lockfile metadata when performing simple merge conflict resolutions`,
+      makeTemporaryEnv(
+        {},
+        async ({path, run, source}) => {
+          await execFile(`git`, [`init`], {cwd: path});
+          await execFile(`git`, [`config`, `user.email`, `[email protected]`], {cwd: path});
+          await execFile(`git`, [`config`, `user.name`, `Your Name`], {cwd: path});
+          await execFile(`git`, [`config`, `commit.gpgSign`, `false`], {cwd: path});
+
+          await run(`install`);
+          await xfs.writeJsonPromise(`${path}/package.json`, {dependencies: {[`no-deps`]: `*`}});
+
+          await execFile(`git`, [`add`, `-A`], {cwd: path});
+          await execFile(`git`, [`commit`, `-a`, `-m`, `my-commit`], {cwd: path});
+
+          await execFile(`git`, [`checkout`, `master`], {cwd: path});
+          await execFile(`git`, [`checkout`, `-b`, `1.0.0`], {cwd: path});
+          await run(`set`, `resolution`, `no-deps@npm:*`, `npm:1.0.0`);
+          await execFile(`git`, [`add`, `-A`], {cwd: path});
+          await execFile(`git`, [`commit`, `-a`, `-m`, `commit-1.0.0`], {cwd: path});
+
+          await execFile(`git`, [`checkout`, `master`], {cwd: path});
+          await execFile(`git`, [`checkout`, `-b`, `2.0.0`], {cwd: path});
+          await run(`set`, `resolution`, `no-deps@npm:*`, `npm:2.0.0`);
+          await execFile(`git`, [`add`, `-A`], {cwd: path});
+          await execFile(`git`, [`commit`, `-a`, `-m`, `commit-2.0.0`], {cwd: path});
+
+          await execFile(`git`, [`checkout`, `master`], {cwd: path});
+          await execFile(`git`, [`merge`, `1.0.0`], {cwd: path});
+
+          await expect(execFile(`git`, [`merge`, `2.0.0`], {cwd: path, env: {LC_ALL: `C`}})).rejects.toThrow(/CONFLICT/);
+
+          let lockfile = await xfs.readFilePromise(`${path}/yarn.lock`, `utf8`);
+          lockfile = lockfile.replace(/(checksum: ).*/g, `$1<checksum stripped>`);
+
+          expect(lockfile).toMatchSnapshot();
+
+          await expect(run(`install`, {
+            enableNetwork: false,
+          })).resolves.toMatchSnapshot();
+        },
+      ),
+    );
   });
 });

packages/plugin-essentials/sources/commands/install.ts

@@ -435,13 +435,13 @@ async function autofixMergeConflicts(configuration: Configuration, immutable: bo
 
   // We must keep the lockfile version as small as necessary to force Yarn to
   // refresh the merged-in lockfile metadata that may be missing.
-  merged.__metadata.version = Math.min(0, ...variants.map(variant => {
-    return variant.__metadata.version ?? Infinity;
-  }));
+  merged.__metadata.version = `${Math.min(...variants.map(variant => {
+    return parseInt(variant.__metadata.version ?? 0);
+  }))}`;
 
-  merged.__metadata.cacheKey = Math.min(0, ...variants.map(variant => {
-    return variant.__metadata.cacheKey ?? 0;
-  }));
+  merged.__metadata.cacheKey = `${Math.min(...variants.map(variant => {
+    return parseInt(variant.__metadata.cacheKey ?? 0);
+  }))}`;
 
   // parse as valid YAML except that the objects become strings. We can use
   // that to detect them. Damn, it's really ugly though.