rckt parent
I just disabled everything AI related. It's a nice editor. But I still have to jump into VSCode to resolve merge conflicts.
Recently the Zed team added some tools to help with merge conflicts: https://github.com/zed-industries/zed/issues/4964#issuecomme...