Hello Plaza members,
I have a problem updating Couchpotato.
This is the log output.
doUpdate self.repo.pull() File "/home/vinc1402/.couchpotato/libs/git/repository.py", line 389, in pull self._executeGitCommandAssertSuccess(command) File "/home/vinc1402/.couchpotato/libs/git/repository.py", line 85, in _executeGitCommandAssertSuccess raise GitCommandFailedException(kwargs.get('cwd', self._getWorkingDirectory()), command, returned) GitCommandFailedException: GitCommandFailedException: Command 'pull' failed in /home/vinc1402/.couchpotato (1): error: Your local changes to the following files would be overwritten by merge: libs/rtorrent/file.py libs/rtorrent/peer.py libs/rtorrent/rpc/__init__.py libs/rtorrent/torrent.py libs/rtorrent/tracker.py libs/subliminal/core.py libs/subliminal/services/__init__.py Please, commit your changes or stash them before you can merge. Aborting Updating 0a97ed5..dae7327
My first guess is that there are files modified on CP folders causing this error. ( I only modified the config file for the correct home dir )
Does anyone have any suggestions?
Kind regards,
Vinc1402