Open merceyz opened 5 months ago
Yarn currently supports resolving merge conflicts in the lockfile caused by git merge, git rebase, and git cherry-pick but not git revert.
git merge
git rebase
git cherry-pick
git revert
Support resolving merge conflicts from git revert by checking git rev-parse REVERT_HEAD HEAD here: https://github.com/yarnpkg/berry/blob/580f593db4ab592bfff2d9fd5c5613c29c6fee2b/packages/plugin-essentials/sources/commands/install.ts#L392-L406
git rev-parse REVERT_HEAD HEAD
Describe the user story
Yarn currently supports resolving merge conflicts in the lockfile caused by
git merge,git rebase, andgit cherry-pickbut notgit revert.Describe the solution you'd like
Support resolving merge conflicts from
git revertby checkinggit rev-parse REVERT_HEAD HEADhere: https://github.com/yarnpkg/berry/blob/580f593db4ab592bfff2d9fd5c5613c29c6fee2b/packages/plugin-essentials/sources/commands/install.ts#L392-L406