diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 3985793..c95bcac 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -28,7 +28,7 @@ body: attributes: label: Pake version description: > - Please provide the version of Pake you are using. If you are using the master/dev branch, please provide the commit id. + Please provide the version of Pake you are using. If you are using the main/dev branch, please provide the commit id. validations: required: true - type: textarea diff --git a/.github/workflows/contribute_list.yml b/.github/workflows/contribute_list.yml index 5ba5239..ff55b14 100644 --- a/.github/workflows/contribute_list.yml +++ b/.github/workflows/contribute_list.yml @@ -2,7 +2,7 @@ name: Build Contribute List on: push: branches: - - master + - main jobs: contrib-readme-job: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a75ccba..3ce431a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -6,15 +6,15 @@ ```mermaid graph LR - b_dev(dev) --> b_master(master); + b_dev(dev) --> b_main(main); contributions([Develop / Pull requests]) -.-> b_dev; ``` - `dev` branch - `dev` is the developing branch. - It's **RECOMMENDED** to commit feature PR to `dev`. -- `master` branch - - `master` is the release branch, we will make tag and publish version on this branch. +- `main` branch + - `main` is the release branch, we will make tag and publish version on this branch. - If it is a document modification, it can be submitted to this branch. ## More diff --git a/README.md b/README.md index a800dd9..13ea7b8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -