search

smashwilson / merge-conflicts

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

nothing happening on Mac #166

Closed SirZach closed 9 years ago

SirZach commented 9 years ago

I tried doing alt+m down and other variations and I can't get that conflicts file to show up. The console didn't yield any errors or warnings.

screen shot 2015-07-17 at 1 58 49 pm

Atom version 1.0.2. merge-conflicts version 1.3.3

smashwilson commented 9 years ago

It's alt-m d to detect conflicts. You can also run "Merge Conflicts: Detect" from the command palette, or check the keybinding resolver to see if something is conflicting - I just shuffled them from ctrl-m chords in #157 because those conflicted.

SirZach commented 9 years ago

got it. i'll close for now. i didn't realize i had to run a command although i'm pretty sure i tried alt+m d. thanks for the response!