Skip to content

Commit 74420ed

Browse files
committed
Renaming master to main
1 parent 1144f1f commit 74420ed

File tree

5 files changed

+22
-22
lines changed

5 files changed

+22
-22
lines changed

.github/ISSUE_TEMPLATE/report-an-issue.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ assignees: bdemers
88
---
99

1010
<!--
11-
For Security Vulnerabilities, please see https://github.com/paseto-toolkit/jpaseto/blob/master/SECURITY.md
11+
For Security Vulnerabilities, please see https://github.com/paseto-toolkit/jpaseto/blob/main/SECURITY.md
1212
-->

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<!--
2-
For Security Vulnerabilities, please see https://github.com/paseto-toolkit/jpaseto/blob/master/SECURITY.md
2+
For Security Vulnerabilities, please see https://github.com/paseto-toolkit/jpaseto/blob/main/SECURITY.md
33
-->

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
on:
1818
push:
19-
branches: # build any changes to master
20-
- master
19+
branches: # build any changes to main
20+
- main
2121
tags: # all tags
2222
- '*'
2323
pull_request: # build all PRs

CONTRIBUTING.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ On your computer, follow these steps to setup a local repository for working on
2121
$ git clone https://github.com/YOUR_ACCOUNT/jpaseto.git
2222
$ cd jpaseto
2323
$ git remote add upstream https://github.com/paseto-toolkit/jpaseto.git
24-
$ git checkout master
24+
$ git checkout main
2525
$ git fetch upstream
26-
$ git rebase upstream/master
26+
$ git rebase upstream/main
2727
```
2828

2929

3030
Making changes
3131
--------------
3232

33-
It is important that you create a new branch to make changes on and that you do not change the `master` branch (other than to rebase in changes from `upstream/master`). In this example I will assume you will be making your changes to a branch called `feature_x`. This `feature_x` branch will be created on your local repository and will be pushed to your forked repository on GitHub. Once this branch is on your fork you will create a Pull Request for the changes to be added to the JPaseto project.
33+
It is important that you create a new branch to make changes on and that you do not change the `main` branch (other than to rebase in changes from `upstream/main`). In this example I will assume you will be making your changes to a branch called `feature_x`. This `feature_x` branch will be created on your local repository and will be pushed to your forked repository on GitHub. Once this branch is on your fork you will create a Pull Request for the changes to be added to the JPaseto project.
3434

3535
It is best practice to create a new branch each time you want to contribute to the project and only track the changes for that pull request in this branch.
3636

@@ -45,37 +45,37 @@ $ git commit -a -m "descriptive commit message for your changes"
4545
> The `-b` specifies that you want to create a new branch called `feature_x`. You only specify `-b` the first time you checkout because you are creating a new branch. Once the `feature_x` branch exists, you can later switch to it with only `git checkout feature_x`.
4646
4747

48-
Rebase `feature_x` to include updates from `upstream/master`
48+
Rebase `feature_x` to include updates from `upstream/main`
4949
------------------------------------------------------------
5050

51-
It is important that you maintain an up-to-date `master` branch in your local repository. This is done by rebasing in the code changes from `upstream/master` (the official JPaseto project repository) into your local repository. You will want to do this before you start working on a feature as well as right before you submit your changes as a pull request. I recommend you do this process periodically while you work to make sure you are working off the most recent project code.
51+
It is important that you maintain an up-to-date `main` branch in your local repository. This is done by rebasing in the code changes from `upstream/main` (the official JPaseto project repository) into your local repository. You will want to do this before you start working on a feature as well as right before you submit your changes as a pull request. I recommend you do this process periodically while you work to make sure you are working off the most recent project code.
5252

5353
This process will do the following:
5454

55-
1. Checkout your local `master` branch
56-
2. Synchronize your local `master` branch with the `upstream/master` so you have all the latest changes from the project
55+
1. Checkout your local `main` branch
56+
2. Synchronize your local `main` branch with the `upstream/main` so you have all the latest changes from the project
5757
3. Rebase the latest project code into your `feature_x` branch so it is up-to-date with the upstream code
5858

5959
``` bash
60-
$ git checkout master
60+
$ git checkout main
6161
$ git fetch upstream
62-
$ git rebase upstream/master
62+
$ git rebase upstream/main
6363
$ git checkout feature_x
64-
$ git rebase master
64+
$ git rebase main
6565
```
6666

67-
> Now your `feature_x` branch is up-to-date with all the code in `upstream/master`.
67+
> Now your `feature_x` branch is up-to-date with all the code in `upstream/main`.
6868
6969

7070
Make a GitHub Pull Request to contribute your changes
7171
-----------------------------------------------------
7272

7373
When you are happy with your changes and you are ready to contribute them, you will create a Pull Request on GitHub to do so. This is done by pushing your local changes to your forked repository (default remote name is `origin`) and then initiating a pull request on GitHub.
7474

75-
> **IMPORTANT:** Make sure you have rebased your `feature_x` branch to include the latest code from `upstream/master` _before_ you do this.
75+
> **IMPORTANT:** Make sure you have rebased your `feature_x` branch to include the latest code from `upstream/main` _before_ you do this.
7676
7777
``` bash
78-
$ git push origin master
78+
$ git push origin main
7979
$ git push origin feature_x
8080
```
8181

@@ -85,7 +85,7 @@ To initiate the pull request, do the following:
8585

8686
1. In your browser, navigate to your forked repository: [https://github.com/YOUR_ACCOUNT/jpaseto](https://github.com/YOUR_ACCOUNT/jpaseto)
8787
2. Click the new button called '**Compare & pull request**' that showed up just above the main area in your forked repository
88-
3. Validate the pull request will be into the upstream `master` and will be from your `feature_x` branch
88+
3. Validate the pull request will be into the upstream `main` and will be from your `feature_x` branch
8989
4. Enter a detailed description of the work you have done and then click '**Send pull request**'
9090

9191
If you are requested to make modifications to your proposed changes, make the changes locally on your `feature_x` branch, re-push the `feature_x` branch to your fork. The existing pull request should automatically pick up the change and update accordingly.
@@ -94,14 +94,14 @@ If you are requested to make modifications to your proposed changes, make the ch
9494
Cleaning up after a successful pull request
9595
-------------------------------------------
9696

97-
Once the `feature_x` branch has been committed into the `upstream/master` branch, your local `feature_x` branch and the `origin/feature_x` branch are no longer needed. If you want to make additional changes, restart the process with a new branch.
97+
Once the `feature_x` branch has been committed into the `upstream/main` branch, your local `feature_x` branch and the `origin/feature_x` branch are no longer needed. If you want to make additional changes, restart the process with a new branch.
9898

99-
> **IMPORTANT:** Make sure that your changes are in `upstream/master` before you delete your `feature_x` and `origin/feature_x` branches!
99+
> **IMPORTANT:** Make sure that your changes are in `upstream/main` before you delete your `feature_x` and `origin/feature_x` branches!
100100
101101
You can delete these deprecated branches with the following:
102102

103103
``` bash
104-
$ git checkout master
104+
$ git checkout main
105105
$ git branch -D feature_x
106106
$ git push origin :feature_x
107107
```

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<licenses>
4444
<license>
4545
<name>The Apache License, Version 2.0</name>
46-
<url>https://github.com/paseto-toolkit/jpaseto/blob/master/LICENSE</url>
46+
<url>https://github.com/paseto-toolkit/jpaseto/blob/main/LICENSE</url>
4747
</license>
4848
</licenses>
4949

0 commit comments

Comments
 (0)