undefined | Better HN

0 pointsNezteb9mo ago0 comments

Recently the Zed team added some tools to help with merge conflicts: https://github.com/zed-industries/zed/issues/4964#issuecomme...

0 comments

rckt9mo ago

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

j / k navigate · click thread line to collapse

0 pointsNezteb9mo ago0 comments

Recently the Zed team added some tools to help with merge conflicts: https://github.com/zed-industries/zed/issues/4964#issuecomme...

rckt9mo ago

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

j / k navigate · click thread line to collapse