Skip to content

Commit

Permalink
Chore: Use the main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
amotl committed Nov 30, 2022
1 parent 73def70 commit f58fe3e
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: Tests

on:
push:
branches: [ master ]
branches: [ main ]
pull_request:
branches: [ master ]
branches: [ main ]

# Allow job to be triggered manually.
workflow_dispatch:
Expand Down
12 changes: 6 additions & 6 deletions CONTRIBUTING.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ our CLA_. Once that is done, we suggest to continue as follows:

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

- Use a feature branch, not master.
- Use a feature branch, not ``main``.

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

- Be descriptive in your PR and commit messages. What is it for, why is it
needed, etc.
Expand All @@ -44,12 +44,12 @@ Rebase
------

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

git fetch origin
git rebase origin/master
git rebase origin/main

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

git rebase -i origin/master
git rebase -i origin/main

``git commit --fixup`` will mark the commit as a fixup relating to the commit
HEAD currently points to.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -139,4 +139,4 @@ Please refer to CONTRIBUTING.rst for further information.

## License & Copyright

[Apache License 2.0](https://github.com/crate/activerecord-crate-adapter/blob/master/LICENSE)
[Apache License 2.0](https://github.com/crate/activerecord-crate-adapter/blob/main/LICENSE)
2 changes: 1 addition & 1 deletion activerecord-crate-adapter.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ Gem::Specification.new do |spec|

spec.metadata = {
"bug_tracker_uri" => "https://github.com/crate/activerecord-crate-adapter/issues",
"changelog_uri" => "https://github.com/crate/activerecord-crate-adapter/blob/master/history.txt",
"changelog_uri" => "https://github.com/crate/activerecord-crate-adapter/blob/main/history.txt",
"source_code_uri" => "https://github.com/crate/activerecord-crate-adapter"
}

Expand Down

0 comments on commit f58fe3e

Please sign in to comment.