Skip to content

Commit

Permalink
Update references to 'master' branch with 'main' (#320)
Browse files Browse the repository at this point in the history
  • Loading branch information
jonkoops authored Jan 13, 2022
1 parent e7967a4 commit cb92903
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Here's a quick checklist for a good PR, more details below:
2. An issue associated with the PR
3. One feature/change per PR
4. One commit per PR
5. PR rebased on master (`git rebase`, not `git pull`)
5. PR rebased on `main` branch (`git rebase`, not `git pull`)
6. No changes to code not directly related to your PR
7. Includes test
8. Includes documentation
Expand Down Expand Up @@ -64,10 +64,10 @@ In the description of your PR include a link to the PR to [Keycloak Documentatio

### Submitting your PR

When preparing your PR make sure you have a single commit and your branch is rebased on the master branch from the
When preparing your PR make sure you have a single commit and your branch is rebased on the `main` branch from the
project repository.

This means use the `git rebase` command and not `git pull` when integrating changes from master to your branch. See
This means use the `git rebase` command and not `git pull` when integrating changes from `main` to your branch. See
[Git Documentation](https://git-scm.com/book/en/v2/Git-Branching-Rebasing) for more details.

We require that you squash to a single commit. You can do this with the `git rebase -i HEAD~X` command where X
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

![Build Status](https://github.com/keycloak/keycloak-nodejs-connect/workflows/CI/badge.svg)
[![Dependency Status](https://img.shields.io/david/keycloak/keycloak-nodejs-connect.svg?style=flat-square)](https://david-dm.org/keycloak/keycloak-nodejs-connect)
[![Coverage Status](https://coveralls.io/repos/github/keycloak/keycloak-nodejs-connect/badge.svg?branch=master)](https://coveralls.io/github/keycloak/keycloak-nodejs-connect?branch=master)
[![Coverage Status](https://coveralls.io/repos/github/keycloak/keycloak-nodejs-connect/badge.svg?branch=main)](https://coveralls.io/github/keycloak/keycloak-nodejs-connect?branch=main)

Keycloak is an Open Source Identity and Access Management solution for modern Applications and Services.

Expand Down
2 changes: 1 addition & 1 deletion docs/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<!---
Please read https://github.com/keycloak/keycloak/blob/master/CONTRIBUTING.md and follow these guidelines when contributing to Keycloak
Please read https://github.com/keycloak/keycloak/blob/main/CONTRIBUTING.md and follow these guidelines when contributing to Keycloak
-->

0 comments on commit cb92903

Please sign in to comment.