Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(docs): branch name changed to main #1430

Merged
merged 1 commit into from
Sep 26, 2023
Merged

fix(docs): branch name changed to main #1430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ If you find a problem 🐛 or have a better idea 💡 during use, you can modify
- ci: Continuous integration
- build || chore: Changes in build tools or dependent packages

6. Submit a pull request to the `master` branch of the upstream repository, and we will review it.
6. Submit a pull request to the `main` branch of the upstream repository, and we will review it.

> Note: The master branch is an unstable code branch, new code will be merged to master, if you need to use stable code, you can switch to the tag. git checkout ${tag_name}
> Note: The main branch is an unstable code branch, new code will be merged to main, if you need to use stable code, you can switch to the tag. git checkout ${tag_name}

7. Release process, pull down the latest master branch `maste`, using this command line to generate a new commit, and finally use rebase merge to merge into The master branch `master`.
7. Release process, pull down the latest `main` branch, using this command line to generate a new commit, and finally use rebase merge to merge into the `main` branch.

```shell
npm version [patch | minor | major] -m '${Commit message}'
Expand Down
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING_CN.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,11 @@
- ci: 持续集成
- build || chore: 构建过程或辅助工具的变动

6. 最后，向上游仓库中的 `master` 分支发起一个 pull request 请求，我们将对其进行认真的审查。
6. 最后，向上游仓库中的 `main` 分支发起一个 pull request 请求，我们将对其进行认真的审查。

> 注意：master 分支为不稳定代码分支，新的代码都会 merge 到 master，如果您需要使用稳定代码，可以切换到对应的 tag。git checkout ${tag_name}
> 注意：main 分支为不稳定代码分支，新的代码都会 merge 到 main，如果您需要使用稳定代码，可以切换到对应的 tag。git checkout ${tag_name}

7. 发版流程，拉下最新的主分支 `maste`，使用下面这个命令行产生一个新的 commit，最后使用 rebase merge 合并到主分支 `master`。
7. 发版流程，拉下最新的主分支 `main`，使用下面这个命令行产生一个新的 commit，最后使用 rebase merge 合并到主分支 `main`。

```shell
npm version [patch | minor | major] -m '${Commit message}'
Expand Down