Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] git: Detect conflict markets in BOTH_ADDED files when staging #50252

Merged
merged 1 commit into from Jul 6, 2018

Conversation

Projects
None yet
2 participants
@zhuowei
Copy link
Contributor

commented May 22, 2018

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?

git: Detect conflict markets in BOTH_ADDED files when staging
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.

@joaomoreno joaomoreno added this to the Backlog milestone May 28, 2018

@joaomoreno joaomoreno added the git label May 28, 2018

@joaomoreno joaomoreno merged commit 325a919 into microsoft:master Jul 6, 2018

1 check passed

license/cla All CLA requirements met.

@joaomoreno joaomoreno modified the milestones: Backlog, July 2018 Jul 6, 2018

@joaomoreno

This comment has been minimized.

Copy link
Member

commented Jul 6, 2018

Thanks! 🍻

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.