It would be nice if zed highlighted git conflicts in files, and maybe provided the ability to choose an automatic resolution (for example using the ⚡ icon that shows code actions)
If applicable, add mockups / screenshots to help present your vision of the feature
Check for existing issues
Describe the feature
It would be nice if zed highlighted git conflicts in files, and maybe provided the ability to choose an automatic resolution (for example using the ⚡ icon that shows code actions)
If applicable, add mockups / screenshots to help present your vision of the feature
VSCode