Skip to content

Commit f58fe3e

Browse files
committed
Chore: Use the main branch
1 parent 73def70 commit f58fe3e

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Tests
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ main ]
88

99
# Allow job to be triggered manually.
1010
workflow_dispatch:

CONTRIBUTING.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ our CLA_. Once that is done, we suggest to continue as follows:
2828

2929
- Add an issue on Github and let us know that you're working on something.
3030

31-
- Use a feature branch, not master.
31+
- Use a feature branch, not ``main``.
3232

33-
- Rebase your feature branch onto origin/master before raising the PR
33+
- Rebase your feature branch onto origin/main before raising the PR
3434

3535
- Be descriptive in your PR and commit messages. What is it for, why is it
3636
needed, etc.
@@ -44,12 +44,12 @@ Rebase
4444
------
4545

4646
If while you've been working in the feature branch new commits were added to
47-
the master branch please don't merge them but use rebase::
47+
the ``main`` branch please don't merge them but use rebase::
4848

4949
git fetch origin
50-
git rebase origin/master
50+
git rebase origin/main
5151

52-
This will apply all commits on your feature branch on top of the master branch.
52+
This will apply all commits on your feature branch on top of the main branch.
5353
Any conflicts can be resolved just the same as if ``git merge`` was used. After
5454
the conflict has been resolved use ``git rebase --continue`` to continue the
5555
rebase process.
@@ -78,7 +78,7 @@ For example while working on a feature branch you'd use::
7878
git add .
7979
git commit --fixup $(git rev-parse HEAD)
8080

81-
git rebase -i origin/master
81+
git rebase -i origin/main
8282

8383
``git commit --fixup`` will mark the commit as a fixup relating to the commit
8484
HEAD currently points to.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,4 +139,4 @@ Please refer to CONTRIBUTING.rst for further information.
139139

140140
## License & Copyright
141141

142-
[Apache License 2.0](https://github.com/crate/activerecord-crate-adapter/blob/master/LICENSE)
142+
[Apache License 2.0](https://github.com/crate/activerecord-crate-adapter/blob/main/LICENSE)

activerecord-crate-adapter.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Gem::Specification.new do |spec|
4040

4141
spec.metadata = {
4242
"bug_tracker_uri" => "https://github.com/crate/activerecord-crate-adapter/issues",
43-
"changelog_uri" => "https://github.com/crate/activerecord-crate-adapter/blob/master/history.txt",
43+
"changelog_uri" => "https://github.com/crate/activerecord-crate-adapter/blob/main/history.txt",
4444
"source_code_uri" => "https://github.com/crate/activerecord-crate-adapter"
4545
}
4646

0 commit comments

Comments
 (0)