HN2new | past | comments | ask | show | jobs | submitlogin

It just reads through the merge conflict and intelligently resolves it. This is not a problem.




Guidelines | FAQ | Lists | API | Security | Legal | Apply to YC | Contact

Search: