{"action":"created","issue":{"url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/157","labels_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/157/labels{/name}","comments_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/157/comments","events_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/157/events","html_url":"https://github.com/smashwilson/merge-conflicts/issues/157","id":91531277,"number":157,"title":"Ctrl-M keybinding conflicts with matching bracket on windows and linux","user":{"login":"forivall","id":760204,"avatar_url":"https://avatars.githubusercontent.com/u/760204?v=3","gravatar_id":"","url":"https://api.github.com/users/forivall","html_url":"https://github.com/forivall","followers_url":"https://api.github.com/users/forivall/followers","following_url":"https://api.github.com/users/forivall/following{/other_user}","gists_url":"https://api.github.com/users/forivall/gists{/gist_id}","starred_url":"https://api.github.com/users/forivall/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/forivall/subscriptions","organizations_url":"https://api.github.com/users/forivall/orgs","repos_url":"https://api.github.com/users/forivall/repos","events_url":"https://api.github.com/users/forivall/events{/privacy}","received_events_url":"https://api.github.com/users/forivall/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/smashwilson/merge-conflicts/labels/interface","name":"interface","color":"fbca04"}],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":2,"created_at":"2015-06-28T00:14:36Z","updated_at":"2015-06-28T12:43:27Z","closed_at":null,"body":"I would be in favor of changing this keybinding for linux and windows. Alt-m appears free, tested using the keybinding resolver (alt-.)."},"comment":{"url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/comments/116273083","html_url":"https://github.com/smashwilson/merge-conflicts/issues/157#issuecomment-116273083","issue_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/157","id":116273083,"user":{"login":"smashwilson","id":17565,"avatar_url":"https://avatars.githubusercontent.com/u/17565?v=3","gravatar_id":"","url":"https://api.github.com/users/smashwilson","html_url":"https://github.com/smashwilson","followers_url":"https://api.github.com/users/smashwilson/followers","following_url":"https://api.github.com/users/smashwilson/following{/other_user}","gists_url":"https://api.github.com/users/smashwilson/gists{/gist_id}","starred_url":"https://api.github.com/users/smashwilson/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/smashwilson/subscriptions","organizations_url":"https://api.github.com/users/smashwilson/orgs","repos_url":"https://api.github.com/users/smashwilson/repos","events_url":"https://api.github.com/users/smashwilson/events{/privacy}","received_events_url":"https://api.github.com/users/smashwilson/received_events","type":"User","site_admin":false},"created_at":"2015-06-28T12:43:27Z","updated_at":"2015-06-28T12:43:27Z","body":"Oh, so it does! Using Alt-M chords instead sounds reasonable to me. :+1: I'll change them in the next release; if you don't want to wait that long, you can add the following to your keymap:\r\n\r\n```coffeescript\r\n'atom-text-editor.conflicted':\r\n  'alt-m down': 'merge-conflicts:next-unresolved'\r\n  'alt-m up': 'merge-conflicts:previous-unresolved'\r\n  'alt-m enter': 'merge-conflicts:accept-current'\r\n  'alt-m r': 'merge-conflicts:revert-current'\r\n  'alt-m 1': 'merge-conflicts:accept-ours'\r\n  'alt-m 2': 'merge-conflicts:accept-theirs'\r\n\r\n'atom-workspace':\r\n  'alt-m d': 'merge-conflicts:detect'\r\n```\r\n\r\n@aurelienbottazini: Are the alt-m chords open on Mac as well? I could also make the cmd-m for Mac, instead. (I could also check myself when I'm on my Mac again.)\r\n\r\nI am a *little* nervous about yanking the keybindings around and messing with everyone's muscle memory like this, but since we've been breaking bracket-matcher I think that's a cost we'll have to pay.\r\n\r\nHonestly, I've become reluctant to specify keybindings within a package at all, because I can't predict what other packages a user will have active and conflicts seem inevitable for *someone*. When I made my other package, I made it a [\"bring your own keybinding\"]((https://github.com/smashwilson/stacktrace#commands)) one instead. It's a little less nice to set up as a beginner (you need to read the README and edit your keymap and so on) but it saves us trying to hunt for chords that aren't taken by other core or popular packages."}}