anton@3a08d80997f4:/tpcc/tpcc-course-2020$ tpcc update
--------------------------------------------------------------------------------
Hi, anton!

Command running: ['update'], cwd: /tpcc/tpcc-course-2020
Platform: Linux-4.15.0-88-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: 36334786c3749e9c7f5612117aff0fb638440779

Updating tasks repository

error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.

Command '['git', 'pull', 'origin', 'master']' returned non-zero exit status 128.
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 128.
anton@3a08d80997f4:/tpcc/tpcc-course-2020$ git stash
tasks/0-intro/deadlock/test.cpp: needs merge
tasks/0-intro/deadlock/test.cpp: needs merge
tasks/0-intro/deadlock/test.cpp: unmerged (a2127c57b3844a8d5eb1f000b56d997a86c12087)
tasks/0-intro/deadlock/test.cpp: unmerged (d181bcf321f407edc817cd72111f222a05cc0bea)
tasks/0-intro/deadlock/test.cpp: unmerged (4b80efe5997db2bc9ba6ebeb63272ac11fd1c133)
fatal: git-write-tree: error building trees
Cannot save the current index state
anton@3a08d80997f4:/tpcc/tpcc-course-2020$