Git conflict highlighting/resolution

zed-industries / zed

Code at the speed of thought – Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

https://zed.dev

Other

46.78k stars 2.67k forks source link

Git conflict highlighting/resolution #4964

Open fwrs opened 1 year ago

fwrs commented 1 year ago

Check for existing issues

[X] Completed

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

stjepangolemac commented 12 months ago

I wanted to open a separate issue but this looks like it covers it.

It would be really useful if merge conflicts were highlighted in the scrollbar to the right.