{"action":"created","issue":{"url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/179","labels_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/179/labels{/name}","comments_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/179/comments","events_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/179/events","html_url":"https://github.com/smashwilson/merge-conflicts/issues/179","id":102433216,"number":179,"title":"Resolve entire file throws Uncaught TypeError: undefined is not a function","user":{"login":"wolfgang42","id":2261204,"avatar_url":"https://avatars.githubusercontent.com/u/2261204?v=3","gravatar_id":"","url":"https://api.github.com/users/wolfgang42","html_url":"https://github.com/wolfgang42","followers_url":"https://api.github.com/users/wolfgang42/followers","following_url":"https://api.github.com/users/wolfgang42/following{/other_user}","gists_url":"https://api.github.com/users/wolfgang42/gists{/gist_id}","starred_url":"https://api.github.com/users/wolfgang42/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/wolfgang42/subscriptions","organizations_url":"https://api.github.com/users/wolfgang42/orgs","repos_url":"https://api.github.com/users/wolfgang42/repos","events_url":"https://api.github.com/users/wolfgang42/events{/privacy}","received_events_url":"https://api.github.com/users/wolfgang42/received_events","type":"User","site_admin":false},"labels":[{"url":"https://api.github.com/repos/smashwilson/merge-conflicts/labels/boom","name":"boom","color":"e11d21"}],"state":"open","locked":false,"assignee":null,"milestone":null,"comments":4,"created_at":"2015-08-21T18:01:08Z","updated_at":"2015-11-11T10:52:34Z","closed_at":null,"body":"When I right-click on a binary file (I don't have a text file to test with readily available) and select Resolve Entire File (either Theirs or Ours) I get the following error:\r\n\r\n**Atom Version**: 1.0.7\r\n**System**: Microsoft Windows 8.1 Pro\r\n**Thrown From**: [merge-conflicts](https://github.com/smashwilson/merge-conflicts) package, v1.3.5\r\n\r\n\r\n### Stack Trace\r\n\r\nUncaught TypeError: undefined is not a function\r\n\r\n```\r\nAt C:\\Users\\wfaust\\.atom\\packages\\merge-conflicts\\lib\\git-bridge.coffee:175\r\n\r\nTypeError: undefined is not a function\r\n  at Function.GitBridge.checkoutSide (C:\\Users\\wfaust\\.atom\\packages\\merge-conflicts\\lib\\git-bridge.coffee:175:28)\r\n  at space-pen-div.<anonymous> (C:\\Users\\wfaust\\.atom\\packages\\merge-conflicts\\lib\\view\\merge-conflicts-view.coffee:133:17)\r\n  at CommandRegistry.module.exports.CommandRegistry.handleCommandEvent (C:\\Users\\wfaust\\AppData\\Local\\atom\\app-1.0.7\\resources\\app.asar\\src\\command-registry.js:241:29)\r\n  at CommandRegistry.handleCommandEvent (C:\\Users\\wfaust\\AppData\\Local\\atom\\app-1.0.7\\resources\\app.asar\\src\\command-registry.js:3:61)\r\n  at CommandRegistry.module.exports.CommandRegistry.dispatch (C:\\Users\\wfaust\\AppData\\Local\\atom\\app-1.0.7\\resources\\app.asar\\src\\command-registry.js:156:19)\r\n  at [object Object].jQuery.fn.trigger (C:\\Users\\wfaust\\AppData\\Local\\atom\\app-1.0.7\\resources\\app.asar\\src\\space-pen-extensions.js:64:23)\r\n  at EventEmitter.<anonymous> (C:\\Users\\wfaust\\AppData\\Local\\atom\\app-1.0.7\\resources\\app.asar\\src\\window-event-handler.js:75:67)\r\n  at emitTwo (events.js:87:13)\r\n  at EventEmitter.emit (events.js:169:7)\r\n  at EventEmitter.ipc.sendSync (C:\\Users\\wfaust\\AppData\\Local\\atom\\app-1.0.7\\resources\\atom.asar\\renderer\\api\\lib\\ipc.js:21:31)\r\n  at BrowserWindow.RemoteMemberFunction [as emit] (C:\\Users\\wfaust\\AppData\\Local\\atom\\app-1.0.7\\resources\\atom.asar\\renderer\\api\\lib\\remote.js:110:29)\r\n  at ContextMenuManager.module.exports.ContextMenuManager.showForEvent (C:\\Users\\wfaust\\AppData\\Local\\atom\\app-1.0.7\\resources\\app.asar\\src\\context-menu-manager.js:170:31)\r\n  at HTMLDocument.<anonymous> (C:\\Users\\wfaust\\AppData\\Local\\atom\\app-1.0.7\\resources\\app.asar\\src\\window-event-handler.js:150:33)\r\n  at HTMLDocument.handler (C:\\Users\\wfaust\\AppData\\Local\\atom\\app-1.0.7\\resources\\app.asar\\src\\space-pen-extensions.js:112:34)\r\n  at HTMLDocument.jQuery.event.dispatch (C:\\Users\\wfaust\\AppData\\Local\\atom\\app-1.0.7\\resources\\app.asar\\node_modules\\space-pen\\vendor\\jquery.js:4681:9)\r\n  at HTMLDocument.elemData.handle (C:\\Users\\wfaust\\AppData\\Local\\atom\\app-1.0.7\\resources\\app.asar\\node_modules\\space-pen\\vendor\\jquery.js:4359:46)\r\n\r\n```\r\n\r\n### Commands\r\n\r\n```\r\n     -9:11.5.0 merge-conflicts:detect (atom-text-editor.editor.is-focused)\r\n     -7:34.7.0 editor:delete-to-end-of-word (atom-text-editor.editor.is-focused)\r\n     -7:33.1.0 atom-terminal-panel:toggle-autocompletion (atom-text-editor.editor.is-focused.autocomplete-active)\r\n     -7:32.9.0 core:undo (atom-text-editor.editor.is-focused.autocomplete-active)\r\n     -7:31.5.0 merge-conflicts:detect (atom-text-editor.editor.is-focused)\r\n     -3:54.8.0 atom-terminal-panel:toggle-autocompletion (atom-text-editor.editor.conflicted.is-focused)\r\n     -3:54.6.0 core:undo (atom-text-editor.editor.conflicted.is-focused)\r\n  2x -3:46.7.0 merge-conflicts:detect (atom-text-editor.editor.conflicted.is-focused)\r\n     -3:28.3.0 atom-terminal-panel:toggle-autocompletion (atom-text-editor.editor.is-focused.conflicted)\r\n  3x -3:28.1.0 core:undo (atom-text-editor.editor.is-focused.conflicted)\r\n     -3:26.2.0 atom-terminal-panel:toggle-autocompletion (atom-text-editor.editor.is-focused.conflicted)\r\n  3x -3:26.1.0 core:undo (atom-text-editor.editor.is-focused.conflicted)\r\n```\r\n\r\n### Config\r\n\r\n```json\r\n{\r\n  \"core\": {\r\n    \"themes\": [\r\n      \"one-light-ui\",\r\n      \"one-light-syntax\"\r\n    ],\r\n    \"disabledPackages\": [\r\n      \"file-icons\"\r\n    ]\r\n  },\r\n  \"merge-conflicts\": {}\r\n}\r\n```\r\n\r\n### Installed Packages\r\n\r\n```coffee\r\n# User\r\natom-terminal-panel, v4.4.4\r\natomatigit, v1.5.4\r\ncustom-title, v1.0.1\r\nemmet, v2.3.12\r\nfile-type-icons, v0.7.3\r\nindent-guide-improved, v1.4.2\r\nlanguage-diff, v0.3.1\r\nmerge-conflicts, v1.3.5\r\nmocha-runner, v1.1.5\r\nraml, v0.2.0\r\nsymbol-gen, v1.0.0\r\ntidy-tabs, v0.2.0\r\ntree-view-git-status, v0.1.2\r\n\r\n# Dev\r\nNo dev packages\r\n```"},"comment":{"url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/comments/155735307","html_url":"https://github.com/smashwilson/merge-conflicts/issues/179#issuecomment-155735307","issue_url":"https://api.github.com/repos/smashwilson/merge-conflicts/issues/179","id":155735307,"user":{"login":"pietrovismara","id":9806520,"avatar_url":"https://avatars.githubusercontent.com/u/9806520?v=3","gravatar_id":"","url":"https://api.github.com/users/pietrovismara","html_url":"https://github.com/pietrovismara","followers_url":"https://api.github.com/users/pietrovismara/followers","following_url":"https://api.github.com/users/pietrovismara/following{/other_user}","gists_url":"https://api.github.com/users/pietrovismara/gists{/gist_id}","starred_url":"https://api.github.com/users/pietrovismara/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/pietrovismara/subscriptions","organizations_url":"https://api.github.com/users/pietrovismara/orgs","repos_url":"https://api.github.com/users/pietrovismara/repos","events_url":"https://api.github.com/users/pietrovismara/events{/privacy}","received_events_url":"https://api.github.com/users/pietrovismara/received_events","type":"User","site_admin":false},"created_at":"2015-11-11T10:52:34Z","updated_at":"2015-11-11T10:52:34Z","body":"Very annoying, this make the package almost unusable."}}