Recently the Zed team added some tools to help with merge conflicts: https://git... | Hacker News

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

		Nezteb 6 months ago \| parent \| context \| favorite \| on: The Zed Debugger Is Here Recently the Zed team added some tools to help with merge conflicts: https://github.com/zed-industries/zed/issues/4964#issuecomme...

rckt 6 months ago [–]

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

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