yaroslaw@adb3db42d4c6:/tpcc/tpcc-course-2020$ tpcc update
--------------------------------------------------------------------------------
Good evening, yaroslaw!

Command running: ['update'], cwd: /tpcc/tpcc-course-2020
Platform: Linux-5.3.0-28-generic-x86_64-with-Ubuntu-18.04-bionic
C++ compiler: /usr/bin/clang++-8 (clang version 8.0.0-3~ubuntu18.04.2 (tags/RELEASE_800/final))
Python: 3.6.9, CPython, /tpcc/tpcc-course-2020/client/venv/bin/python
Repository root directory: /tpcc/tpcc-course-2020
Git current commit: 6a12f669ff0a968d72a6f499dd16a55b93d934aa

Updating tasks repository

From https://gitlab.com/Lipovsky/tpcc-course-2020
 * branch            master     -> FETCH_HEAD
Updating 6a12f66..1a62ab1
error: Your local changes to the following files would be overwritten by merge:
	tasks/0-intro/deadlock/test.cpp
Please commit your changes or stash them before you merge.
Aborting

Command '['git', 'pull', 'origin', 'master']' returned non-zero exit status 1.
Traceback (most recent call last):
  File "/tpcc/tpcc-course-2020/client/client.py", line 324, in main
    args.cmd(args)
  File "/tpcc/tpcc-course-2020/client/client.py", line 96, in update_command
    client.update(args.all)
  File "/tpcc/tpcc-course-2020/client/tpcc/course.py", line 46, in update
    subprocess.check_call(["git", "pull", "origin", "master"])
  File "/usr/lib/python3.6/subprocess.py", line 311, in check_call
    raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '['git', 'pull', 'origin', 'master']' returned non-zero exit status 1.