[scalar-docs]

The latest generated output on scalar-generated conflicts with the custom code on scalar-next (build JC6W8hbP7PPwyiSPfrvUp).

1 file conflicted — the regenerated output and your edits on scalar-next changed overlapping regions (an edit next to a regenerated line is enough to collide):

• src/client.ts

  <<<<<<< HEAD
      // @custom start
      // Use the API's UUIDv7 format. Automatic retries reuse this value.
      return `${Date.now().toString(16).padStart(12, '0')}7${uuid4().replace(/-/g, '').slice(13)}`;
      // @custom end
  =======
      return uuid7().replace(/-/g, '');
  >>>>>>> 4e4b87cba9cd6b857834ac6f2dd4ad4db4acb0d8
  

Resolve the conflicts here, then merge this PR into scalar-next. You can also resolve it locally: git fetch && git checkout scalar-merge-conflict--build--JC6W8hbP7PPwyiSPfrvUp && git merge origin/scalar-next. The platform will not touch this branch while your resolution is in progress.

Warning

Do not squash or rebase this PR — merge it with "Create a merge commit".
Squashing drops the merge ancestry, so the next generation re-conflicts on the very lines you just resolved. If Squash and merge is the only button offered, turn on "Allow merge commits" under Settings → General → Pull Requests first.
The platform detects and repairs a squashed resolution on the next generation, but that is a fallback, not a substitute.