Skip to content

Commit 5f85066

Browse files
authored
Merge pull request #538 from mono/master-to-main
Change master branch to main
2 parents 928f6ed + 9131f85 commit 5f85066

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ If you are working in an area of the code that has transitioned to the new codin
3737

3838
This project tries to avoid chatty in-progress commits that are common during development. Once you’ve completed your development and are ready to move to the next stage of the contribution workflow, collapse your changes into as few feature-scoped commits as possible. Ideally if possible, every commit should pass all unit tests and be standalone.
3939

40-
You can do so either by using an interactive rebase of your branch if you need multiple commits, or simply doing a soft reset `git reset origin/master —soft` … which will stage all of your changes and let you create a new single commit that contains all changes.
40+
You can do so either by using an interactive rebase of your branch if you need multiple commits, or simply doing a soft reset `git reset origin/main —soft` … which will stage all of your changes and let you create a new single commit that contains all changes.
4141

4242
The commit message should be verbose enough to explain what behavior is changing, bug is being fixed, or feature being added. It should also contain a reference to the github issue being resolved, as [described here](https://github.com/blog/1386-closing-issues-via-commit-messages).
4343

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ steps:
9999
- task: PowerShell@2
100100
name: 'mdocVersion'
101101
displayName: 'Checking remote and local version of mdoc'
102-
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master'))
102+
condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/main'))
103103
inputs:
104104
filePath: 'mdoc/CheckNugetPublish.ps1'
105105

mdoc/mdoc.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<authors>Microsoft</authors>
88
<owners>Microsoft</owners>
99
<projectUrl>https://github.com/mono/api-doc-tools</projectUrl>
10-
<licenseUrl>https://github.com/mono/api-doc-tools/blob/master/LICENSE.md</licenseUrl>
10+
<licenseUrl>https://github.com/mono/api-doc-tools/blob/main/LICENSE.md</licenseUrl>
1111
<requireLicenseAcceptance>true</requireLicenseAcceptance>
1212
<description>.NET API Documentation toolchain</description>
1313
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

0 commit comments

Comments
 (0)