Hacker Newsnew | past | comments | ask | show | jobs | submitlogin

He's not saying you shouldn't have conflicts; just that it's better to have syntax-aware conflict detection. For example if two people add a new function to the end of the same file, Git will always say that's a conflict. A syntax-aware system could say that they don't conflict.


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

Search: