# 撤销merge

有时候推送代码到远程时，发现远程代码有更新的版本，于是我们执行了

```
git pull
```

然而 `git pull` 拉取后与本地代码自动合并后出现冲突。

假设冲突比较好处理还无所谓，但若不好处理，我们可否先取消合并，中断`git pull` 的流程。

方法非常简单：

```
git merge --abort
```

DONE!


---

# Agent Instructions: Querying This Documentation

If you need additional information that is not directly available in this page, you can query the documentation dynamically by asking a question.

Perform an HTTP GET request on the current page URL with the `ask` query parameter:

```
GET https://mm.ricky.moe/other/git/abort-git-merge.md?ask=<question>
```

The question should be specific, self-contained, and written in natural language.
The response will contain a direct answer to the question and relevant excerpts and sources from the documentation.

Use this mechanism when the answer is not explicitly present in the current page, you need clarification or additional context, or you want to retrieve related documentation sections.