[0KRunning with gitlab-runner 12.8.0 (1b659122) [0;m[0K on universal-tn3 a9da50a7 [0;msection_start:1583229242:prepare_executor [0K[0KUsing Docker executor with image quantumtinkerer/research ... [0;m[0KAuthenticating with credentials from /root/.docker/config.json [0;m[0KPulling docker image quantumtinkerer/research ... [0;m[0KUsing docker image sha256:d3c1811e93c7604550a9f0e2373056d246db45c27257d26feecec273c77d9f83 for quantumtinkerer/research ... [0;msection_end:1583229244:prepare_executor [0Ksection_start:1583229244:prepare_script [0K[0KAuthenticating with credentials from /root/.docker/config.json [0;mRunning on runner-a9da50a7-project-713-concurrent-1 via tnw-tn3.tudelft.net... section_end:1583229246:prepare_script [0Ksection_start:1583229246:get_sources [0K[0KAuthenticating with credentials from /root/.docker/config.json [0;m[32;1mFetching changes...[0;m Reinitialized existing Git repository in /builds/solidstate/lectures/.git/ From https://gitlab.kwant-project.org/solidstate/lectures * [new ref] refs/pipelines/29705 -> refs/pipelines/29705 e1a51ac..0fcdb57 master -> origin/master [32;1mChecking out 0fcdb57d as master...[0;m Removing site/ [32;1mSkipping Git submodules setup[0;m section_end:1583229248:get_sources [0Ksection_start:1583229248:restore_cache [0K[0KAuthenticating with credentials from /root/.docker/config.json [0;msection_end:1583229250:restore_cache [0Ksection_start:1583229250:download_artifacts [0K[0KAuthenticating with credentials from /root/.docker/config.json [0;m[32;1mDownloading artifacts for build lectures (104493)...[0;m Downloading artifacts from coordinator... ok [0;m id[0;m=104493 responseStatus[0;m=200 OK token[0;m=VR3oCMEN section_end:1583229254:download_artifacts [0Ksection_start:1583229254:build_script [0K[0KAuthenticating with credentials from /root/.docker/config.json [0;m[32;1m$ git checkout master; git reset --hard origin/master[0;m Previous HEAD position was 0fcdb57 Update 7_tight_binding.md Switched to branch 'master' Your branch is behind 'origin/master' by 1 commit, and can be fast-forwarded. (use "git pull" to update your local branch) HEAD is now at 0fcdb57 Update 7_tight_binding.md [32;1m$ git checkout local; git reset --hard origin/local[0;m Switched to branch 'local' Your branch is up to date with 'origin/local'. HEAD is now at c4b673e Update 7_tight_binding.md [32;1m$ git diff-index --quiet master || git -c "user.name=$GITLAB_USER_NAME" -c "user.email=$GITLAB_USER_EMAIL" merge master[0;m Auto-merging src/7_tight_binding.md CONFLICT (content): Merge conflict in src/7_tight_binding.md Automatic merge failed; fix conflicts and then commit the result. section_end:1583229256:build_script [0Ksection_start:1583229256:after_script [0Ksection_end:1583229258:after_script [0Ksection_start:1583229258:upload_artifacts_on_failure [0K[0KAuthenticating with credentials from /root/.docker/config.json [0;msection_end:1583229260:upload_artifacts_on_failure [0K[31;1mERROR: Job failed: exit code 1 [0;m