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

Meanwhile they can’t manage to get ‘keep both’ implemented in their interactive merge conflict tool. You have to edit it by hand.


Consider applying for YC's Fall 2026 batch! Applications are open till July 27.

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

Search: