Skip to content

Commit

Permalink
rename references to master to main
Browse files Browse the repository at this point in the history
  • Loading branch information
baronfel committed Dec 12, 2023
1 parent b55f1a0 commit 89e6b39
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ name: CI
on:
push:
branches:
- master
- main
pull_request:
branches:
- master
- main

permissions:
contents: read
Expand All @@ -28,15 +28,15 @@ jobs:
run: dotnet fsi build.fsx

- name: Upload documentation
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/main'
uses: actions/upload-pages-artifact@v1
with:
path: ./output

deploy:
runs-on: ubuntu-latest
needs: ci
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/main'
steps:
- name: Deploy to GitHub Pages
id: deployment
Expand Down
26 changes: 13 additions & 13 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Guidelines for bug reports:
reported.

2. **Check if the issue has been fixed** — try to reproduce it using the
`master` branch in the repository.
`main` branch in the repository.

3. **Isolate and report the problem** — ideally create a reduced test
case.
Expand Down Expand Up @@ -97,16 +97,16 @@ in order to craft an excellent pull request:
2. If you cloned a while ago, get the latest changes from upstream, and update your fork:

```bash
git checkout master
git pull upstream master
git checkout main
git pull upstream main
git push
```

3. Create a new topic branch (off of `master`) to contain your feature, change,
3. Create a new topic branch (off of `main`) to contain your feature, change,
or fix.

**IMPORTANT**: Making changes in `master` is discouraged. You should always
keep your local `master` in sync with upstream `master` and make your
**IMPORTANT**: Making changes in `main` is discouraged. You should always
keep your local `main` in sync with upstream `main` and make your
changes in topic branches.

```bash
Expand Down Expand Up @@ -135,17 +135,17 @@ in order to craft an excellent pull request:
with a clear title and description.

8. If you haven't updated your pull request for a while, you should consider
rebasing on master and resolving any conflicts.
rebasing on main and resolving any conflicts.

**IMPORTANT**: _Never ever_ merge upstream `master` into your branches. You
should always `git rebase` on `master` to bring your changes up to date when
**IMPORTANT**: _Never ever_ merge upstream `main` into your branches. You
should always `git rebase` on `main` to bring your changes up to date when
necessary.

```bash
git checkout master
git pull upstream master
git checkout main
git pull upstream main
git checkout <your-topic-branch>
git rebase master
git rebase main
```


Expand All @@ -159,4 +159,4 @@ in order to craft an excellent pull request:
3. Make a new version tag (for example, `v0.45.0`)
1. `git tag v0.45.0`
4. Push changes to the repo.
1. `git push --atomic [insert-remote-branch] master v0.45.0`
1. `git push --atomic [insert-remote-branch] main v0.45.0`
4 changes: 2 additions & 2 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
</PropertyGroup>

<PropertyGroup>
<FsDocsLicenseLink>https://github.com/ionide/FSharp.Analyzers.SDK/blob/master/LICENSE.md</FsDocsLicenseLink>
<FsDocsReleaseNotesLink>https://github.com/ionide/FSharp.Analyzers.SDK/blob/master/CHANGELOG.md</FsDocsReleaseNotesLink>
<FsDocsLicenseLink>https://github.com/ionide/FSharp.Analyzers.SDK/blob/main/LICENSE.md</FsDocsLicenseLink>
<FsDocsReleaseNotesLink>https://github.com/ionide/FSharp.Analyzers.SDK/blob/main/CHANGELOG.md</FsDocsReleaseNotesLink>
<RepositoryUrl>https://github.com/ionide/FSharp.Analyzers.SDK</RepositoryUrl>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ There might be a little voice inside that tells you you're not ready; that you n

I assure you, that's not the case.

This project has some clear Contribution Guidelines and expectations that you can [read here](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/master/CONTRIBUTING.md).
This project has some clear Contribution Guidelines and expectations that you can [read here](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/main/CONTRIBUTING.md).

The contribution guidelines outline the process that you'll need to follow to get a patch merged. By making expectations and process explicit, I hope it will make it easier for you to contribute.

Expand All @@ -50,4 +50,4 @@ Thank you for contributing!
The project is hosted on [GitHub](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK) where you can [report issues](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/issues), fork
the project and submit pull requests.

The library is available under [MIT license](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/master/LICENSE.md), which allows modification and redistribution for both commercial and non-commercial purposes.
The library is available under [MIT license](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/main/LICENSE.md), which allows modification and redistribution for both commercial and non-commercial purposes.
4 changes: 2 additions & 2 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ There might be a little voice inside that tells you you're not ready; that you n

I assure you, that's not the case.

This project has some clear Contribution Guidelines and expectations that you can [read here](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/master/CONTRIBUTING.md).
This project has some clear Contribution Guidelines and expectations that you can [read here](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/main/CONTRIBUTING.md).

The contribution guidelines outline the process that you'll need to follow to get a patch merged. By making expectations and process explicit, I hope it will make it easier for you to contribute.

Expand All @@ -50,6 +50,6 @@ Thank you for contributing!
The project is hosted on [GitHub](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK) where you can [report issues](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/issues), fork
the project and submit pull requests.

The library is available under [MIT license](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/master/LICENSE.md), which allows modification and redistribution for both commercial and non-commercial purposes.
The library is available under [MIT license](https://github.com/Krzysztof-Cieslak/FSharp.Analyzers.SDK/blob/main/LICENSE.md), which allows modification and redistribution for both commercial and non-commercial purposes.

[Next]({{fsdocs-next-page-link}})

0 comments on commit 89e6b39

Please sign in to comment.