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.mdand rootCHANGELOG.mdrarely conflict (different content: release notes vs. full history). If conflict: keep incoming, re-run merge workflow.