Hacker News new | ask | show | jobs
by Nezteb 357 days ago
Recently the Zed team added some tools to help with merge conflicts: https://github.com/zed-industries/zed/issues/4964#issuecomme...
1 comments
rckt 357 days ago
Yeah, but still it's not as comfortable as with VSCode or for example Meld.
link