无法打开Jupyter

Question

我一直在做一个让我们在Jupyter上做在线实验的课程，我已经完成了5个实验中的3个，但是每当我尝试打开第4个和第5个实验时，它都会启动我的服务器，但是在打开之前它会显示此消息

$ git fetch
$ git -c user.email=nbgitpuller@nbgitpuller.link -c user.name=nbgitpuller merge -Xours origin/master
fatal: You have not concluded your merge (MERGE_HEAD exists).
Please, commit your changes before you merge.
Traceback (most recent call last):
File "/srv/conda/envs/notebook/lib/python3.7/threading.py", line 926, in _bootstrap_inner
    self.run()
File "/srv/conda/envs/notebook/lib/python3.7/threading.py", line 870, in run
    self._target(*self._args, **self._kwargs)
File "/srv/conda/envs/notebook/lib/python3.7/site-packages/nbgitpuller/handlers.py", line 88, in pull
    raise e
File "/srv/conda/envs/notebook/lib/python3.7/site-packages/nbgitpuller/handlers.py", line 82, in pull
    for line in gp.pull():
File "/srv/conda/envs/notebook/lib/python3.7/site-packages/nbgitpuller/pull.py", line 86, in pull
    yield from self.update()
File "/srv/conda/envs/notebook/lib/python3.7/site-packages/nbgitpuller/pull.py", line 233, in update
    ], cwd=self.repo_dir)
File "/srv/conda/envs/notebook/lib/python3.7/site-packages/nbgitpuller/pull.py", line 45, in execute_cmd
    raise subprocess.CalledProcessError(ret, cmd)
subprocess.CalledProcessError: Command '['git', '-c', 'user.email=nbgitpuller@nbgitpuller.link', '-c', 'user.name=nbgitpuller', 'merge', '-Xours', 'origin/master']' returned non-zero exit status 128.

我知道这要求很多，但这是什么意思呢？我怎样才能摆脱这个信息，那就是不允许我的实验室开放

Answer 1

如果您不知道正在进行任何本地git合并，可以使用(using Git 2.23+)删除MERGE_HEAD：

cd /path/to/local/repository
git merge --quit