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

Recently the Zed team added some tools to help with merge conflicts: https://github.com/zed-industries/zed/issues/4964#issuecomme...



Yeah, but still it's not as comfortable as with VSCode or for example Meld.




Consider applying for YC's Fall 2025 batch! Applications are open till Aug 4

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

Search: