Traceback (most recent call last):
File "C:\Users\jross\AppData\Local\conda\conda\envs\pychron3\lib\site-packages\pyface\ui\qt4\action\action_item.py", line 163, in _qt4_on_triggered
self.controller.perform(action, action_event)
File "C:\Users\jross\AppData\Local\conda\conda\envs\pychron3\lib\site-packages\pyface\tasks\action\task_action_controller.py", line 31, in perform
return action.perform(event)
File "C:\Users\raregas\.pychron.0\pychron\pychron\updater\tasks\actions.py", line 47, in perform
up.check_for_updates(inform=True)
File "C:\Users\raregas\.pychron.0\pychron\pychron\updater\updater.py", line 93, in check_for_updates
self._repo.git.pull(origin, hexsha)
File "C:\Users\jross\AppData\Local\conda\conda\envs\pychron3\lib\site-packages\git\cmd.py", line 550, in <lambda>
return lambda *args, **kwargs: self._call_process(name, *args, **kwargs)
File "C:\Users\jross\AppData\Local\conda\conda\envs\pychron3\lib\site-packages\git\cmd.py", line 1009, in _call_process
return self.execute(call, **exec_kwargs)
File "C:\Users\jross\AppData\Local\conda\conda\envs\pychron3\lib\site-packages\git\cmd.py", line 820, in execute
raise GitCommandError(command, status, stderr_value, stdout_value)
git.exc.GitCommandError: Cmd('git') failed due to: exit code(1)
cmdline: git pull origin e32c69b079675e454a1e86bc49bda69f499e7cb7
stdout: 'Updating 6bce1102a..e32c69b07'
stderr: 'From https://github.com/WiscAr/pychron
* branch e32c69b079675e454a1e86bc49bda69f499e7cb7 -> FETCH_HEAD
error: Your local changes to the following files would be overwritten by merge:
pychron/entry/labnumber_entry.py
Please commit your changes or stash them before you merge.
Aborting'
active branch=release/py3/v18.2
active analyses=
description=""
Traceback