You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Copy file name to clipboardexpand all lines: CONTRIBUTING.md
+6-6
Original file line number
Diff line number
Diff line change
@@ -23,7 +23,7 @@ By contributing to IntelliTect, you assert that:
23
23
* The contribution is your own original work.
24
24
* You have the right to assign the copyright for the work (it is not owned by your employer, or
25
25
you have been given copyright assignment in writing).
26
-
* You [license](https://github.com/IntelliTect/IntelliTect/blob/master/LICENSE) the contribution under the terms applied to the rest of the IntelliTect project.
26
+
* You [license](https://github.com/IntelliTect/IntelliTect/blob/main/LICENSE) the contribution under the terms applied to the rest of the IntelliTect project.
27
27
28
28
## Code
29
29
### Code style
@@ -64,7 +64,7 @@ Any new code should also have reasonable unit test coverage.
64
64
* Test your changes and please help us out by updating and implementing some automated tests.
65
65
It is recommended that all contributors spend some time looking over the tests in the source code.
66
66
You can't go wrong emulating one of the existing tests and then changing it specific to the behavior you are testing.
67
-
* Please do not update your branch from Master unless we ask you to. See the responding to feedback section below.
67
+
* Please do not update your branch from main unless we ask you to. See the responding to feedback section below.
68
68
69
69
### Prepare commits
70
70
This section serves to help you understand what makes a good commit.
@@ -116,10 +116,10 @@ Sometimes we may need you to rebase your commit against the latest code before w
116
116
If this happens, you can do the following:
117
117
118
118
*`git fetch upstream` (upstream would be the mainstream repo or `IntelliTect` in this case)
119
-
*`git checkout master`
120
-
*`git rebase upstream/master`
119
+
*`git checkout main`
120
+
*`git rebase upstream/main`
121
121
*`git checkout your-branch`
122
-
*`git rebase master`
122
+
*`git rebase main`
123
123
* Fix any merge conflicts
124
124
*`git push origin your-branch` (origin would be your GitHub repo or `your-github-username/IntelliTect` in this case).
125
125
You may need to `git push origin your-branch --force` to get the commits pushed.
@@ -132,7 +132,7 @@ The only reasons a pull request should be closed and resubmitted are as follows:
132
132
Then the old branch is closed with a note on the newer branch this supersedes #github_number.
133
133
134
134
## NuGet
135
-
Currently AppVeyor is building and releasing NuGets on every merge to the release branch. All PRs should be merged into master and then a PR from master into release when new NuGets are needed. Avoid PRs from feature branches directly to the release branch.
135
+
Currently AppVeyor is building and releasing NuGets on every merge to the release branch. All PRs should be merged into main and then a PR from main into release when new NuGets are needed. Avoid PRs from feature branches directly to the release branch.
136
136
137
137
## Other general information
138
138
If you reformat code or hit core functionality without an approval from a person on the IntelliTect Team,
0 commit comments