Don't compute new modifiers during collapsing merge instructions #4670
Conversation
This file contains 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
|
@oxidase Can you add a changelog entry, like Apart from that, LGTM. |
oxidase
force-pushed
the
guidance/fix-merge-straight
branch
from
8cc9bd6
to
5822cbd
Compare
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.
Issue
Collapsing of a merge instruction with a new-name instruction updates the direction modifier, so it is posible to get
{Merge, Straight}instruction.This PR prevents updates of directions modifiers.
Tasklist
Requirements / Relations
Link any requirements here. Other pull requests this PR is based on?