smashwilson / merge-conflicts

Resolve git merge conflicts in Atom
https://atom.io/packages/merge-conflicts
MIT License
432 stars 42 forks source link

[Feature Request] Minimap Plugin? #266

Open r0ckarong opened 7 years ago

r0ckarong commented 7 years ago

Hi,

I've started a discussion over at the minimap project about a highlighter for merge conflicts in the minimap. Could you elaborate on how you do detection for that stuff so maybe someone can work on a plugin? I'm not adept enough in coding to even try that myself.

https://github.com/atom-minimap/minimap/issues/583 https://github.com/atom-minimap/minimap-git-diff/issues/28

smashwilson commented 7 years ago

:wave: Thanks for taking the time to file an issue here! Unfortunately, this repository is being deprecated, so I won't be getting to this one here.

This issue still applies to the new git and GitHub package for Atom, so I've refiled this one at atom/github#813. Subscribe there for updates :sparkles: