Hacker News new | ask | show | jobs
by rckt 362 days ago
I just disabled everything AI related. It's a nice editor. But I still have to jump into VSCode to resolve merge conflicts.
1 comments
Nezteb 362 days ago
Recently the Zed team added some tools to help with merge conflicts: https://github.com/zed-industries/zed/issues/4964#issuecomme...
link
rckt 361 days ago
Yeah, but still it's not as comfortable as with VSCode or for example Meld.
link