@@ -77,12 +77,12 @@ encouraged to create mockups for any issue you see and attach them.
77
77
## Hacking
78
78
79
79
The first thing to keep in mind if you want to modify the source code:
80
- checkout the ** master ** branch. It is the branch that we use to
80
+ checkout the ** main ** branch. It is the branch that we use to
81
81
develop new features and fix issues that are planned for the next big
82
82
release. See the [ INSTALL] ( INSTALL.md ) guide to know how to compile.
83
83
84
84
To start looking the source code, see how it is organized in
85
- [ src/README.md] ( https://github.com/aseprite/aseprite/tree/master /src/#aseprite-source-code )
85
+ [ src/README.md] ( https://github.com/aseprite/aseprite/tree/main /src/#aseprite-source-code )
86
86
file.
87
87
88
88
## Forking & Pull Requests
@@ -93,22 +93,22 @@ You can fork the GitHub repository using the Fork button at
93
93
The Pull Requests (PR) systems works in this way:
94
94
95
95
1 . First of all you will need to sign our
96
- [ Contributor License Agreement] ( https://github.com/aseprite/sourcecode/blob/master /sign-cla.md#sign-the-cla ) (CLA).
97
- 1 . Then you can start working on Aseprite. Create a new branch from ` master ` , e.g. ` fix-8 ` to fix the issue 8.
96
+ [ Contributor License Agreement] ( https://github.com/aseprite/sourcecode/blob/main /sign-cla.md#sign-the-cla ) (CLA).
97
+ 1 . Then you can start working on Aseprite. Create a new branch from ` main ` , e.g. ` fix-8 ` to fix the issue 8.
98
98
Check this guide about [ how to name your branch] ( https://github.com/agis/git-style-guide#branches ) .
99
99
1 . Start working on that new branch, and push your commits to your fork.
100
- 1 . Create a new PR to merge your ` fix-8 ` branch to the official ` master ` .
100
+ 1 . Create a new PR to merge your ` fix-8 ` branch to the official ` main ` .
101
101
1 . If the PR is accepted (does not require review/comments/modifications),
102
- your branch is merged into ` master ` .
103
- 1 . You will need to pull changes from the official ` master ` branch, and
104
- merge them in your own ` master ` branch. Finally you can discard your
102
+ your branch is merged into ` main ` .
103
+ 1 . You will need to pull changes from the official ` main ` branch, and
104
+ merge them in your own ` main ` branch. Finally you can discard your
105
105
own ` fix-8 ` branch (because those changes should be already merged
106
- into ` master ` if the PR was accepted).
107
- 1 . Continue working from the new ` master ` head.
106
+ into ` main ` if the PR was accepted).
107
+ 1 . Continue working from the new ` main ` head.
108
108
109
- To keep in mind: ** always** start working from the ` master ` head, if you
109
+ To keep in mind: ** always** start working from the ` main ` head, if you
110
110
want to fix three different issues, create three different branches
111
- from ` master ` and then send three different PR. Do not chain all the
111
+ from ` main ` and then send three different PR. Do not chain all the
112
112
fixes in one single branch. E.g. ` fix-issues-3-and-8-and-25 ` .
113
113
114
114
## Community
0 commit comments