Fix overwrites from files in the original branch which causes changes in the current branch to be missed until the next commit #13
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
… in the current branch to be missed until the next commit
jnm2
force-pushed
the
fix_overwrites_from_other_branches
branch
from
2924a8e
to
7d966b1
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.
I reviewed all IsOrContains calls and found one more place where the arguments were swapped. The second place is rather benign since it was only disabling a check, and the check would only be useful if it was catching an independent bug.
This is a good reason to consider refactoring to a form like
target.IsSamePathOrParentPathOf(itemPath).