[WIP] git: Detect conflict markets in BOTH_ADDED files when staging#50252
Merged
joaomoreno merged 1 commit intomicrosoft:masterfrom Jul 6, 2018
Merged
[WIP] git: Detect conflict markets in BOTH_ADDED files when staging#50252joaomoreno merged 1 commit intomicrosoft:masterfrom
joaomoreno merged 1 commit intomicrosoft:masterfrom
Conversation
The existing code only checked for conflict markers for files with BOTH_MODIFIED status; files with BOTH_ADDED status were always detected as conflicting even after conflicts are resolved. This fixes microsoft#44106.
Member
|
Thanks! 🍻 |
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
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
The existing code only checked for conflict markers for files with BOTH_MODIFIED status; files with BOTH_ADDED status were always detected as conflicting even after conflicts are resolved.
This fixes #44106.
I have only tested this against this testcase in the original issue . I have not tested to see if this breaks existing conflict detection: are there any Git testcases I can run to make sure that I've fixed the issue and that I didn't introduce regressions?