berry icon indicating copy to clipboard operation
berry copied to clipboard

[Feature] Support resolving lockfile merge conflicts from `git revert`

Open merceyz opened this issue 1 year ago • 0 comments

  • [ ] I'd be willing to implement this feature (contributing guide)
  • [x] This feature is important to have in this repository; a contrib plugin wouldn't do

Describe the user story

Yarn currently supports resolving merge conflicts in the lockfile caused by git merge, git rebase, and git cherry-pick but not git revert.

Describe the solution you'd like

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

merceyz avatar Apr 30 '24 13:04 merceyz