mirror of
https://github.com/atom/atom.git
synced 2026-04-06 03:02:13 -04:00
a1d8ee86f9
I got the following error when running `checkout-head-revision`:
```
Uncaught TypeError: undefined is not a function /Applications/Atom.app/Contents/Resources/app/src/editor-component.js:804
addCommandListeners.editor:checkout-head-revision /Applications/Atom.app/Contents/Resources/app/src/editor-component.js:804
(anonymous function) /Applications/Atom.app/Contents/Resources/app/src/editor-component.js:840
jQuery.event.dispatch /Applications/Atom.app/Contents/Resources/app/node_modules/space-pen/vendor/jquery.js:4676
elemData.handle /Applications/Atom.app/Contents/Resources/app/node_modules/space-pen/vendor/jquery.js:4360
module.exports.KeymapManager.dispatchCommandEvent /Applications/Atom.app/Contents/Resources/app/node_modules/atom-keymap/lib/keymap-manager.js:400
module.exports.KeymapManager.handleKeyboardEvent /Applications/Atom.app/Contents/Resources/app/node_modules/atom-keymap/lib/keymap-manager.js:181
module.exports.WindowEventHandler.onKeydown
```
It looks like it was caused by a bad merge conflict resolution in 0eaec57.
Test Plan:
Built new Atom and pressed `cmd-alt-z` and didn't get an error.
Looked at a side-by-side diff to check for any other merge issues:
```
git difftool -t opendiff 32e59ce..32e59ce^ src/editor-component.coffee
```
Atom is a hackable text editor for the 21st century, built on atom-shell, and based on everything we love about our favorite editors. We designed it to be deeply customizable, but still approachable using the default configuration.
Visit atom.io to learn more.
Installing
Mac OS X
Download the latest Atom release.
Atom will automatically update when a new release is available.
Windows
Install the Atom chocolatey package.
- Install chocolatey.
- Close and reopen your command prompt or PowerShell window.
- Run
cinst Atom - In the future run
cup Atomto upgrade to the latest release.
You can also download a .zip file from the releases page.
The Windows version does not currently automatically update so you will need to
manually upgrade to future releases by re-downloading the .zip file.
Building
Developing
Check out the guides and the API reference.