Resolve pnpm-lock.yaml merge conflict in PR #36655

[Copilot]

Packages impacted by this PR

None - lockfile regeneration only

Issues associated with this PR

Resolves merge conflict in #36655

Describe the problem that is addressed by this PR

PR #36655 has a merge conflict in pnpm-lock.yaml due to divergent changes between the PR branch (jeremymeng:test-custom-agents) and main. The binary lockfile cannot be merged automatically.

What are the possible designs available to address the problem? If there are more than one possible design, why was the one in this PR chosen?

The standard approach for lockfile conflicts is to regenerate it:

1. Merge latest main into PR branch
2. Run pnpm install --no-frozen-lockfile to regenerate lockfile based on package.json files from both branches
3. Commit the regenerated lockfile

This ensures dependency resolution reflects both the PR changes and latest main.

Are there test cases added in this PR? (If not, why?)

No - this is a lockfile regeneration with no code changes.

Provide a list of related PRs (if any)

• Original PR with conflict: [wip] introduce pnpm-lock.yaml conflict #36655

Command used to generate this PR:**(Applicable only to SDK release request PRs)

N/A

Checklists

• Added impacted package name to the issue description
• Does this PR needs any fixes in the SDK Generator?** (If so, create an Issue in the Autorest/typescript repository and link it here)
• Added a changelog (if necessary)

---

Note: Unable to push directly to jeremymeng:test-custom-agents. Changes available in copilot/resolve-merge-conflict-pnpm-lock-again branch for comparison: jeremymeng:test-custom-agents...copilot/resolve-merge-conflict-pnpm-lock-again

The resolved pnpm-lock.yaml can be cherry-picked from commit 481b3327d6.

Original prompt

---

This section details on the original issue you should resolve

<issue_title>Resolve merge conflict in #36655</issue_title>
<issue_description></issue_description>

<agent_instructions>You are an expert AI agent specialized in resolving merge conflict of pnpm-lock.yaml in pull requests. Your sole responsibility is to safely merge latest main branch to the pull request branch then re-generate the pnpm-lock.yaml file.

If a pull request has merge conflicts in other files you should not perform any steps listed and report to users instead.

If you have permission to push to the pull request branch, you may do so in step 5a) below; Otherwise do step 5b): push the changes to your working branch then in your summary report provide a link to compare your working branch against the pull request branch.

Required Steps

1. Check out the pull request branch
2. Merge changes from latest main into pull request branch
3. Update lockfile
4. Stage the changes to pnpm-lock.yaml and commit the merge
5. push your merge commit
   a. If you have permission to push to the pull request branch, push your changes to that branch and be done; otherwise,
   b. Push your changes to your working branch, then include in your summary report a GitHub link to the comparison between your working branch and the pull request branch

Critical: All five steps must be completed.

Workflow

Depending on your Git remote setup, you may need to use "upstream" instead of "origin", whichever pointing to Azure/azure-sdk-for-js.

1. Check out the pull request branch

Before proceeding, run git status which should show your working branch.

git fetch origin pull/<PR #>/head:resolve-conflict-pr-<PR #>
git checkout resolve-conflict-pr-<PR #>

2. Merge changes from latest main of Azure/azure-sdk-for-js into pull request branch

git fetch --unshallow origin main && git merge main

3. Update lockfile

pnpm install --no-frozen-lockfile

4. Stage the changes to pnpm-lock.yaml and commit the merge

git add pnpm-lock.yaml && git commit -m "Merging from latest main branch"

5. Push your merge commit

a. If you have permission to push to the pull request branch

git push origin resolve-conflict-pr-<PR #>:<PR branch>

b. If you do NOT have permission to push to the pull request branch

Push the changes to your working branch,

git checkout <your working branch>
git merge resolve-conflict-pr-<PR #>
git push origin <your working branch>

Then provide a comparison link in the summary of your work:

• example link if the PR branch is in Azure/azure-sdk-for-js repository: "https://github.com/Azure/azure-sdk-for-js/compare/..."
• example link if the PR branch is from a fork: "https://github.com//azure-sdk-for-js/compare/..."

Error Handling

Merge conflicts in files other than pnpm-lock.yaml Report and exit

pnpm install fails: Report error and exit</agent_instructions>

Comments on the Issue (you are @copilot in this section)

• Fixes Resolve merge conflict in https://github.com/Azure/azure-sdk-for-js/pull/36655 #36656

---

💬 We'd love your input! Share your thoughts on Copilot coding agent in our 2 minute survey.