smashwilson / merge-conflicts

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

Request: Add support for mini-map #257

Open jolsen71 opened 7 years ago

jolsen71 commented 7 years ago

When the minimap Atom package is installed and enabled, it would be wonderful if the all of the ours/theirs sections were reflected in the mini map when fixing conflicts.

Perhaps via a minimap plugin, such as minimap-linter.

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: