Join GitHub today
GitHub is home to over 36 million developers working together to host and review code, manage projects, and build software together.Sign up
[WIP] git: Detect conflict markets in BOTH_ADDED files when staging #50252
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?