Merge Conflicts

Resolve merge conflicts in package.json, package-lock.json, SHA256.md following project conventions

forcedotcom 7b67adf 749 B Updated

File contents

Merge Conflict Resolution

package.json

Use higher value for conflicts on the version property.

Use higher version for any conflicts in dependencies or devDependencies.

package-lock.json

After all package.json conflicts are fixed, run npm install to fix the conflicts in the lockfile. Never edit the lockfile directly.

Misc other files

Always take incoming changes:

  • SHA256.md
  • packages/salesforcedx-vscode/CHANGELOG.md and root CHANGELOG.md rarely conflict (different content: release notes vs. full history). If conflict: keep incoming, re-run merge workflow.

forcedotcom/apex-language-support/tree/main/.claude/skills/merge-conflicts commit 7b67adf017

Frequently asked questions

npx skillmds@latest add forcedotcom/merge-conflicts