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

Odd merge conflict failure #217

Open

mtbc opened this issue Mar 13, 2017 · 1 comment

Labels

bug

Member

mtbc commented Mar 13, 2017

ome/openmicroscopy#5170 suffers from,

[ scc.git] INFO Conflict detection failed

Given the PR name this may be another Unicode issue akin to #188.

Member Author

mtbc commented Mar 14, 2017

Yes, removing the Unicode seems to have fixed the problem. There was some in both the title and the description.

sbesson added the bug label

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment