https://www.jetbrains.com.cn/en-us/help/rider/Resolve_conflicts.html
Resolve Git conflicts | JetBrains Rider Documentation
git conflictsjetbrains riderresolvedocumentation
https://dev.to/cloudx/resolving-git-conflicts-in-package-lockjson-using-a-merge-driver-2ipk
Resolving Git conflicts in package-lock.json using a merge driver - DEV Community
Using Git attributes and merge drivers to resolve conflicts automatically. Tagged with git, npm, node, github.
git conflictsdev communitypackagelockjson
https://www.jetbrains.com/help/idea/resolve-conflicts.html
Resolve Git conflicts | IntelliJ IDEA Documentation
git conflictsintellij idearesolvedocumentation