We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
git revert
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
Support resolving merge conflicts from git revert by checking git rev-parse REVERT_HEAD HEAD here:
git rev-parse REVERT_HEAD HEAD
berry/packages/plugin-essentials/sources/commands/install.ts
Lines 392 to 406 in 580f593
The text was updated successfully, but these errors were encountered:
No branches or pull requests
Describe the user story
Yarn currently supports resolving merge conflicts in the lockfile caused by
git merge
,git rebase
, andgit cherry-pick
but notgit revert
.Describe the solution you'd like
Support resolving merge conflicts from
git revert
by checkinggit rev-parse REVERT_HEAD HEAD
here:berry/packages/plugin-essentials/sources/commands/install.ts
Lines 392 to 406 in 580f593
The text was updated successfully, but these errors were encountered: