Skip to content

Commit aba366f

Browse files
Prepare to update branch to main
1 parent 96eb76e commit aba366f

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

CONTRIBUTING.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ By contributing to IntelliTect, you assert that:
2323
* The contribution is your own original work.
2424
* You have the right to assign the copyright for the work (it is not owned by your employer, or
2525
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.
2727

2828
## Code
2929
### Code style
@@ -64,7 +64,7 @@ Any new code should also have reasonable unit test coverage.
6464
* Test your changes and please help us out by updating and implementing some automated tests.
6565
It is recommended that all contributors spend some time looking over the tests in the source code.
6666
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.
6868

6969
### Prepare commits
7070
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
116116
If this happens, you can do the following:
117117

118118
* `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`
121121
* `git checkout your-branch`
122-
* `git rebase master`
122+
* `git rebase main`
123123
* Fix any merge conflicts
124124
* `git push origin your-branch` (origin would be your GitHub repo or `your-github-username/IntelliTect` in this case).
125125
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:
132132
Then the old branch is closed with a note on the newer branch this supersedes #github_number.
133133

134134
## 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.
136136

137137
## Other general information
138138
If you reformat code or hit core functionality without an approval from a person on the IntelliTect Team,

IntelliTect.Utilities/IntelliTect.Utilities.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<TargetFramework>netstandard2.0</TargetFramework>
44
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
55
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
66
<Company>IntelliTect-Nuget</Company>
77
<Authors>IntelliTect</Authors>
88
<Description>A utility library for IntelliTect</Description>
9-
<PackageLicenseUrl>https://github.com/IntelliTect/IntelliTect/blob/master/LICENSE</PackageLicenseUrl>
9+
<PackageLicenseUrl>https://github.com/IntelliTect/IntelliTect/blob/main/LICENSE</PackageLicenseUrl>
1010
<Copyright>Copyright © IntelliTect 2019</Copyright>
1111
<PackageProjectUrl>https://github.com/IntelliTect/IntelliTect</PackageProjectUrl>
1212
<RepositoryUrl>https://github.com/IntelliTect/IntelliTect</RepositoryUrl>

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ Libraries
2929
Contributing
3030
============
3131

32-
See the CONTRIBUTING.md file [here](https://raw.githubusercontent.com/IntelliTect/IntelliTect/master/CONTRIBUTING.md).
32+
See the CONTRIBUTING.md file [here](https://raw.githubusercontent.com/IntelliTect/IntelliTect/main/CONTRIBUTING.md).

appveyor.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pull_requests:
44
branches:
55
only:
66
- release
7-
- master
7+
- main
88
skip_branch_with_pr: true
99
image: Visual Studio 2017
1010
assembly_info:

azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# https://aka.ms/yaml
55

66
trigger:
7-
- master
7+
- main
88

99
variables:
1010
IntelliTect.Utilities.Version: 1.0.15

0 commit comments

Comments
 (0)