Open wolfgang42 opened 9 years ago
I have this same issue
I ran into the same issue for a text file.
Same issue, Atom 1.0.11, Ubuntu 14.04, git 2.5.1
This error occurs to me when i open a file listed on the conflicts list on the bottom of atom. After the error i choose to use ours or theirs, the conflict markers are not removed, neither the colored areas. Very annoying, this makes the package unusable.
This error occurs to me when i open a file listed on the conflicts list on the bottom of atom.
Have you tried with 1.3.7? I thought I resolved this with #192, but I could have missed something. If you're still seeing a stack trace, can you paste it here?
After the error i choose to use ours or theirs, the conflict markers are not removed, neither the colored areas. Very annoying, this makes the package unusable.
Ah, that's a different issue, and just an oversight on my part. I thought someone had filed that one but I can't find it now. Noted :+1:
Same here @smashwilson i'm posting the stack trace below:
TypeError: undefined is not a function at SideView.CoveringView.attached (/home/marcio/.atom/packages/merge-conflicts/lib/view/covering-view.coffee:38:21) at SideView.attached (/home/marcio/.atom/packages/merge-conflicts/lib/view/side-view.coffee:61:35) at space-pen-div.View.element.attached (/usr/share/atom/resources/app.asar/node_modules/atom-space-pen-views/node_modules/space-pen/lib/space-pen.js:164:63) at space-pen-div.CustomElementPrototype.attachedCallback (/usr/share/atom/resources/app.asar/node_modules/atom-space-pen-views/node_modules/space-pen/lib/space-pen.js:51:55) at OverlayManager.module.exports.OverlayManager.renderOverlay (/usr/share/atom/resources/app.asar/src/overlay-manager.js:77:21) at OverlayManager.module.exports.OverlayManager.render (/usr/share/atom/resources/app.asar/src/overlay-manager.js:17:16) at TextEditorComponent.module.exports.TextEditorComponent.updateSync (/usr/share/atom/resources/app.asar/src/text-editor-component.js:226:15) at TextEditorComponent.module.exports.TextEditorComponent.becameVisible (/usr/share/atom/resources/app.asar/src/text-editor-component.js:278:21) at TextEditorComponent.module.exports.TextEditorComponent.checkForVisibilityChange (/usr/share/atom/resources/app.asar/src/text-editor-component.js:810:16) at atom-text-editor.TextEditorElement.attachedCallback (/usr/share/atom/resources/app.asar/src/text-editor-element.js:98:22)
@marcioc0sta, can you double check your merge-conflicts version? In 1.3.7, the top line in your stack trace is a comment.
If you aren't on 1.3.7 yet, an upgrade and (possibly) an Atom restart should fix things up for you.
Hi @smashwilson my version is 1.3.7, i've removed and installed again and the problem persists :/
and thanks for the quick response
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:
Atom Version: 1.0.7 System: Microsoft Windows 8.1 Pro Thrown From: merge-conflicts package, v1.3.5
Stack Trace
Uncaught TypeError: undefined is not a function
Commands
Config
Installed Packages