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.

Sign up for GitHub

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

Jump to bottom

3-way merge fallback marks a file as resolved, even if there are still merge conflicts #30

Open
fabb opened this issue Mar 8, 2018 · 0 comments
Open

3-way merge fallback marks a file as resolved, even if there are still merge conflicts #30

fabb opened this issue Mar 8, 2018 · 0 comments

Comments

@fabb
Copy link

fabb commented Mar 8, 2018

since #22, if there are merge conflicts that cannot be resolved by the 3-way text merge, the conflict markers stay in the file (good), but the file gets marked as resolved (bad). the latter results in merge tools not recognizing the file as in conflict, and not being able to assist in resolving the conflicts.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
1 participant
@fabb