search

ome / scc

OME tools for managing the Git(Hub) workflow
https://pypi.org/project/scc/
GNU General Public License v2.0
0 stars 15 forks source link

Odd merge conflict failure #217

Open mtbc opened 7 years ago

mtbc commented 7 years ago

https://github.com/openmicroscopy/openmicroscopy/pull/5170 suffers from,

[ scc.git] INFO Conflict detection failed

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

mtbc commented 7 years ago

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