Fixes rebase and cherry-pick conflict resolution #5102
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
merceyz
requested changes
Nov 29, 2022
merceyz
requested changes
Nov 29, 2022
Co-authored-by: Kristoffer K. <[email protected]>
merceyz
approved these changes
Nov 29, 2022
merceyz
changed the title
3 tasks
arcanis
added a commit
that referenced
this pull request
Jun 16, 2023
**What's the problem this PR addresses?** I broke part of the automatic conflict resolution in #5102 - a code supposed to make Yarn update the lockfile metadata when merging incompatible lockfile versions was incorrectly causing Yarn to do that for each merge conflict resolution. It can be very frustrating when the project includes some dependencies that cannot be easily pulled from the registry (for example when they are a npm git repo which doesn't build anymore due to ERESOLVE 😄). **How did you fix it?** Fix the code to remove the `0` from `Math.min(0, ...)` which was obviously causing the version to always be `0`. **Checklist** <!--- Don't worry if you miss something, chores are automatically tested. --> <!--- This checklist exists to help you remember doing the chores when you submit a PR. --> <!--- Put an `x` in all the boxes that apply. --> - [x] I have read the [Contributing Guide](https://yarnpkg.com/advanced/contributing). <!-- See https://yarnpkg.com/advanced/contributing#preparing-your-pr-to-be-released for more details. --> <!-- Check with `yarn version check` and fix with `yarn version check -i` --> - [x] I have set the packages that need to be released for my changes to be effective. <!-- The "Testing chores" workflow validates that your PR follows our guidelines. --> <!-- If it doesn't pass, click on it to see details as to what your PR might be missing. --> - [x] I will check that all automated PR checks pass before the PR gets reviewed.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What's the problem this PR addresses?
The new merge conflict resolution wasn't compatible with rebases and cherry-picks.
How did you fix it?
Added a fallback on
git rev-list REBASE_HEAD/CHERRY_PICK_HEAD HEAD, along with tests.Checklist