Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Error with MergeConflict: Uncaught TypeError: Cannot read property 'reportMarkerCount' of null #656

Closed
Closed
Error with MergeConflict: Uncaught TypeError: Cannot read property 'reportMarkerCount' of null#656
Labels
bug

Description

@ungb
ungb
opened on Apr 13, 2017

[Enter steps to reproduce:]

  1. open the following zipped project in atom testMergeConflic.zip

  2. Merge conflict says calculating. Click on this once. It opens the file but doesn't show the file tab sometimes.

Opening merge conflict doesn't display file tabs?
image

  1. clicking on github tab and click back gets error.

image

Atom: 1.16.0 x64
Electron: 1.3.13
OS: Mac OS X 10.12.4
Thrown From: github package 0.0.0

Stack Trace

Uncaught TypeError: Cannot read property 'reportMarkerCount' of null

At /Users/bungdonuts/github/packages/github/lib/controllers/editor-conflict-controller.js:235

TypeError: Cannot read property 'reportMarkerCount' of null
    at EditorConflictController.updateMarkerCount (/packages/github/editor-conflict-controller.js:235:5)
    at /packages/github/editor-conflict-controller.js:44:10)
    at ReactCompositeComponentWrapper._constructComponentWithoutOwner (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:298:16)
    at ReactCompositeComponentWrapper._constructComponent (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:285:19)
    at ReactCompositeComponentWrapper.mountComponent (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:188:21)
    at Object.mountComponent (/packages/github/node_modules/react-dom/lib/ReactReconciler.js:46:35)
    at Object.updateChildren (/packages/github/node_modules/react-dom/lib/ReactChildReconciler.js:121:51)
    at ReactDOMComponent._reconcilerUpdateChildren (/packages/github/node_modules/react-dom/lib/ReactMultiChild.js:213:28)
    at ReactDOMComponent._updateChildren (/packages/github/node_modules/react-dom/lib/ReactMultiChild.js:312:31)
    at ReactDOMComponent.updateChildren (/packages/github/node_modules/react-dom/lib/ReactMultiChild.js:299:12)
    at ReactDOMComponent._updateDOMChildren (/packages/github/node_modules/react-dom/lib/ReactDOMComponent.js:936:12)
    at ReactDOMComponent.updateComponent (/packages/github/node_modules/react-dom/lib/ReactDOMComponent.js:754:10)
    at ReactDOMComponent.receiveComponent (/packages/github/node_modules/react-dom/lib/ReactDOMComponent.js:716:10)
    at Object.receiveComponent (/packages/github/node_modules/react-dom/lib/ReactReconciler.js:125:22)
    at ReactCompositeComponentWrapper._updateRenderedComponent (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:754:23)
    at ReactCompositeComponentWrapper._performComponentUpdate (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:724:10)
    at ReactCompositeComponentWrapper.updateComponent (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:645:12)
    at ReactCompositeComponentWrapper.receiveComponent (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:547:10)
    at Object.receiveComponent (/packages/github/node_modules/react-dom/lib/ReactReconciler.js:125:22)
    at ReactCompositeComponentWrapper._updateRenderedComponent (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:754:23)
    at ReactCompositeComponentWrapper._performComponentUpdate (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:724:10)
    at ReactCompositeComponentWrapper.updateComponent (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:645:12)
    at ReactCompositeComponentWrapper.receiveComponent (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:547:10)
    at Object.receiveComponent (/packages/github/node_modules/react-dom/lib/ReactReconciler.js:125:22)
    at Object.updateChildren (/packages/github/node_modules/react-dom/lib/ReactChildReconciler.js:109:25)
    at ReactDOMComponent._reconcilerUpdateChildren (/packages/github/node_modules/react-dom/lib/ReactMultiChild.js:213:28)
    at ReactDOMComponent._updateChildren (/packages/github/node_modules/react-dom/lib/ReactMultiChild.js:312:31)
    at ReactDOMComponent.updateChildren (/packages/github/node_modules/react-dom/lib/ReactMultiChild.js:299:12)
    at ReactDOMComponent._updateDOMChildren (/packages/github/node_modules/react-dom/lib/ReactDOMComponent.js:936:12)
    at ReactDOMComponent.updateComponent (/packages/github/node_modules/react-dom/lib/ReactDOMComponent.js:754:10)
    at ReactDOMComponent.receiveComponent (/packages/github/node_modules/react-dom/lib/ReactDOMComponent.js:716:10)
    at Object.receiveComponent (/packages/github/node_modules/react-dom/lib/ReactReconciler.js:125:22)
    at ReactCompositeComponentWrapper._updateRenderedComponent (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:754:23)
    at ReactCompositeComponentWrapper._performComponentUpdate (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:724:10)
    at ReactCompositeComponentWrapper.updateComponent (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:645:12)
    at ReactCompositeComponentWrapper.performUpdateIfNecessary (/packages/github/node_modules/react-dom/lib/ReactCompositeComponent.js:561:12)
    at Object.performUpdateIfNecessary (/packages/github/node_modules/react-dom/lib/ReactReconciler.js:157:22)
    at runBatchedUpdates (/packages/github/node_modules/react-dom/lib/ReactUpdates.js:150:21)
    at ReactReconcileTransaction.perform (/packages/github/node_modules/react-dom/lib/Transaction.js:140:20)
    at ReactUpdatesFlushTransaction.perform (/packages/github/node_modules/react-dom/lib/Transaction.js:140:20)
    at ReactUpdatesFlushTransaction.perform (/packages/github/node_modules/react-dom/lib/ReactUpdates.js:89:32)
    at Object.flushBatchedUpdates (/packages/github/node_modules/react-dom/lib/ReactUpdates.js:172:19)
    at ReactDefaultBatchingStrategyTransaction.closeAll (/packages/github/node_modules/react-dom/lib/Transaction.js:206:25)
    at ReactDefaultBatchingStrategyTransaction.perform (/packages/github/node_modules/react-dom/lib/Transaction.js:153:16)
    at Object.batchedUpdates (/packages/github/node_modules/react-dom/lib/ReactDefaultBatchingStrategy.js:62:26)
    at Object.batchedUpdates (/packages/github/node_modules/react-dom/lib/ReactUpdates.js:97:27)
    at dispatchEvent (/packages/github/node_modules/react-dom/lib/ReactEventListener.js:147:20)

Commands

     -0:12.9.0 application:reopen-project (input.hidden-input)

Non-Core Packages

busy-signal 1.3.0 
github 0.0.0 
intentions 1.1.2 
linter 2.1.2 
linter-eslint 8.1.4 
linter-ui-default 1.2.2 
seti-syntax 1.1.3 
seti-ui 1.7.0

Versions

Atom Version (atom --version):
Atom : 1.16.0
Electron: 1.3.13
Chrome : 52.0.2743.82
Node : 6.5.0

GitHub Package Version (git --git-dir ~/.atom/packages/github/.git rev-parse head):
b883f2e

Activity

  1. ungb
    added
    bug
    on Apr 13, 2017

  2. ungb commented on Apr 13, 2017

    @ungb
    ungb
    on Apr 13, 2017
    Author

    this is only occurring in #633 as I was testing that branch out.

  3. smashwilson commented on Apr 20, 2017

    @smashwilson
    smashwilson
    on Apr 20, 2017
    Contributor

    Verified fixed by further work in #633 ✨

  4. smashwilson
    closed this as completedon Apr 20, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    bug

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions