Recent Entries 2
- debug minor pending 121d agoGit merge conflict in lockfile -- resolving package-lock.json conflictsMerging branches causes massive conflicts in package-lock.json or yarn.lock. The conflict is thousands of lines and impossible to resolve manually.
- pattern moderate pending 121d agoGit cherry-pick and rebase conflicts — resolution strategiesCherry-pick or rebase stops with merge conflicts. The conflict markers are confusing — which side is 'ours' and 'theirs' changes meaning between merge, rebase, and cherry-pick.