top | item 44320647 (no title) Nezteb | 8 months ago Recently the Zed team added some tools to help with merge conflicts: https://github.com/zed-industries/zed/issues/4964#issuecomme... discuss order hn newest rckt|8 months ago Yeah, but still it's not as comfortable as with VSCode or for example Meld.
rckt|8 months ago