# git分支的新建与合并

Git创建分支：

```
git checkout -b iss53
```

相当于

```
git branch iss53
git checkout iss53
```

合并分支到主干

```
git checkout master
git merge iss53
```

也可以把主干合并到分支（假如当前在iss53分支）

```
git merge iss53
```

当在分支上完成开发，需要找出已经修改过的文件，请使用如下命令检查可能修改过的文件：

```
git status | grep modi
```

> 因为在分枝上做编译，会导致一些临时文件修改，所以只要将实际修改等程序文件加入就可以了

## 参考

* [Git - 分支的新建与合并](https://git-scm.com/book/zh/v1/Git-%E5%88%86%E6%94%AF-%E5%88%86%E6%94%AF%E7%9A%84%E6%96%B0%E5%BB%BA%E4%B8%8E%E5%90%88%E5%B9%B6)


---

# 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://huataihuang.gitbook.io/cloud-atlas-draft/devops/git/git_branch_create_and_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.