search

smashwilson / merge-conflicts

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

Finds conflicted files but no visual feedback #223

Closed stevenbriscoeca closed 8 years ago

stevenbriscoeca commented 8 years ago

As you can see it detect the files that are in conflict, but I don't have any of the visuals that help with the conflict

2016-04-13_10-33-43

saidmoya12 commented 8 years ago

Same issue with the last update

bfrazier2 commented 8 years ago

Same issue

smashwilson commented 8 years ago

I'm closing this as a duplicate of #227. Please subscribe over there for updates :bow: