let squash merge detection be fuzzier #14
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
Currently if you don't merge the upstream branch into your feature branch before merging it back, there's a chance someone else edited the same files, which will cause your diffs to not necessarily have matching line numbers. This patch makes it try a bit harder, but also ignoring the line number lines in the diff.
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.
Currently if you don't merge the upstream branch into your feature
branch before merging it back, there's a chance someone else edited the
same files, which will cause your diffs to not necessarily have matching
line numbers. This patch makes it try a bit harder, but also ignoring
the line number lines in the diff.
This PR was started by: git wf pr