Some tips about git with PR | 使用 git 创建 PR 的一些建议

[zombieJ]

English Version | Chinese Version

English Version

If you don't know much about git branch management, here are some simple suggestions. It's more cumbersome, but always works:

Create branch for PR

🔥🔥🔥 Be sure to create a corresponding new branch for each PR, rather than continuing development on your master and feature branches. 🔥🔥🔥

How to sync my master with latest?

Directly click sync in github page: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

What if I accidentally publish a PR on master, and every subsequent PR always carries the previous commit?

Patch upstream (Skip if already done this):

git remote add upstream https://github.com/ant-design/ant-design.git

Sync remote upstream branch:

git checkout -t upstream/master tmp-master

Override brach:

git br -D master
git checkout -b master
git push -f

---

Chinese Version

如果你对 git 分支管理不太了解，这里有一些简单的建议。它会比较麻烦，但是总是有效：

为 PR 创建分支

🔥🔥🔥 务必每次提交 PR 都要创建一个对应的新分支，而不是在你的 master 和 feature 分支上继续开发。 🔥🔥🔥

如何将我的 master 同步到最新

在 github 页面直接点击 sync 即可：https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

如果我不小心在 master 上发布了一次 PR，之后每次发布 PR 总是会带上之前的 commit 该怎么办？

添加 upstream（如果添加过则不需要重复添加）：

git remote add upstream https://github.com/ant-design/ant-design.git

同步远程分支：

git checkout -t upstream/master tmp-master

覆盖分支：

git br -D master
git checkout -b master
git push -f

[afc163]

加到文档里？

[zombieJ]

嗯，攒完转正