Skip to content

Commit

Permalink
Rename master branch to main
Browse files Browse the repository at this point in the history
  • Loading branch information
pyrech committed Apr 9, 2021
1 parent 9cca717 commit e455d31
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
schedule:
- cron: '0 0 * * MON'
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ git remote add upstream https://github.com/jolicode/JoliNotif.git
Then get the upstream changes:

```shell
git checkout master
git pull --rebase origin master
git pull --rebase upstream master
git checkout main
git pull --rebase origin main
git pull --rebase upstream main
git checkout <your-branch>
git rebase master
git rebase main
```

Finally, publish your changes:
Expand Down
4 changes: 2 additions & 2 deletions VERSIONING.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ The versioning is inspired by [Semantic Versioning](http://semver.org/):
The branching is inspired by [@jbenet](https://github.com/jbenet)
[simple git branching model](https://gist.github.com/jbenet/ee6c9ac48068889b0912):

> 1. `master` must always be deployable.
> 1. `main` must always be deployable.
> 2. **all changes** are made through feature branches (pull-request + merge)
> 3. rebase to avoid/resolve conflicts; merge in to `master`
> 3. rebase to avoid/resolve conflicts; merge in to `main`
5 changes: 0 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,6 @@
"symfony/finder": "^3.3|^4.0|^5.0",
"symfony/phpunit-bridge": "^3.4.26|^4.0|^5.0"
},
"extra": {
"branch-alias": {
"dev-master": "2.3.x-dev"
}
},
"bin": [
"jolinotif"
],
Expand Down

0 comments on commit e455d31

Please sign in to comment.