Refactor merge alignment into _align_for_merge #950
Merged
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
…rget This is a cleaner fix for the issues from GH943 xref GH927
shoyer
force-pushed
the
remove_skip_single_target
branch
from
b76a2f9
to
632741a
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.
This is a cleaner fix for the issues from #943
Moving the logic from
deep_aligninto_align_for_mergegives us better separation of concerns between the modules for alignment and merging, and puts the special rules for alignment as part of merging in a much more obvious location (no moreskip_single_target).xref #927 (cc @crusaderky)