Skip to content

Resolving PR merge conflicts for "common config rush pnpm‐lock.yaml"

Jump to bottom
Jeremy Meng edited this page Mar 13, 2025 · 7 revisions

Here's the recommended process to resolve merge conflicts of common/config/rush/pnpm-lock.yaml in your pull request (assuming your upstream remote is named "upstream"):

  1. git fetch upstream
  2. git merge --no-edit upstream/main
  3. Use your favorite IDE, editor, or Git Client to resolve conflicts for files other than common/config/rush/pnpm-lock.yaml
  4. git checkout upstream/main -- common/config/rush/pnpm-lock.yaml under the project root
  5. rush update
  6. git add common/config/rush/pnpm-lock.yaml
  7. Commit the merge
  8. Push the commit to your pull request branch, for example, git push origin assuming "origin" is remote name for your fork

Step 4) to 6) can be combined and enhanced to run under any directory under the repo if you are using a *NIX environment:

git checkout upstream/main `git rev-parse --show-toplevel`/common/config/rush/pnpm-lock.yaml && rush update && git add `git rev-parse --show-toplevel`/common/config/rush/pnpm-lock.yaml
Clone this wiki locally