如何正确提交PR(避免commit log 中有 Merge...)?

如何正确提交PR(避免commit log 中有 Merge...)?

1. Fork 仓库到自己的 Github

2. 设置 Origin 仓库和 Fork 仓库关联

1. 查看remote情况

$ git remote -v
origin  https://github.com/YOUR_USERNAME/YOUR_FORK.git (fetch)
origin  https://github.com/YOUR_USERNAME/YOUR_FORK.git (push)

2. 设置关联

$ git remote add upstream https://github.com/NG-ZORRO/ng-zorro-antd-mobile.git

3. check out 到 master 同步最新代码

1. 从远程库 fetch

$ git checkout master
$ git fetch upstream
remote: Counting objects: 75, done.
remote: Compressing objects: 100% (53/53), done.
remote: Total 62 (delta 27), reused 44 (delta 9)
Unpacking objects: 100% (62/62), done.
From https://github.com/ORIGINAL_OWNER/ORIGINAL_REPOSITORY
 * [new branch]      master     -> upstream/master

2. merge改动

$ git merge upstream/master
Updating a422352..5fdff0f
Fast-forward
 README                    |    9 -------
 README.md                 |    7 ++++++
 2 files changed, 7 insertions(+), 9 deletions(-)
 delete mode 100644 README
 create mode 100644 README.md

3. push改动

$ git push

4. 【重要】创建新分支 —— 每个分支只负责一次改动，创建后在该分支进行逻辑修改

5. commit前，fetch，merge远端最新代码

6. commit，push 到 fork 仓库

  commit log 参考 CONTRIBUTING ，部分通用格式如下：

• 单个组件修改：feat(module: calendar): your content
• 通用组件修改：feat(components): your content
• README      ：docs(README): your content
• 官网展示修改：fix(showcase): your content
• 正式发版       ：release(0.9.4): release 0.9.4

7. 提交PR，等待review

done.