mirror of
https://github.com/Icinga/icingadb-web.git
synced 2026-02-19 02:27:57 -05:00
Rename default branch to main
This commit is contained in:
parent
ac94de2750
commit
9cb44ed9fd
4 changed files with 14 additions and 14 deletions
2
.github/workflows/L10n-update.yml
vendored
2
.github/workflows/L10n-update.yml
vendored
|
|
@ -3,7 +3,7 @@ name: L10n Update
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
|
||||
jobs:
|
||||
trigger-update:
|
||||
|
|
|
|||
4
.github/workflows/php.yml
vendored
4
.github/workflows/php.yml
vendored
|
|
@ -3,11 +3,11 @@ name: PHP Tests
|
|||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
- release/*
|
||||
pull_request:
|
||||
branches:
|
||||
- master
|
||||
- main
|
||||
|
||||
jobs:
|
||||
lint:
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ Add a new remote `upstream` with this repository as value.
|
|||
git remote add upstream https://github.com/icinga/icingadb-web.git
|
||||
```
|
||||
|
||||
You can pull updates to your fork's master branch:
|
||||
You can pull updates to your fork's default branch:
|
||||
|
||||
```
|
||||
git fetch --all
|
||||
|
|
@ -103,15 +103,15 @@ Don't worry, you can squash those changes into a single commit later on.
|
|||
|
||||
## Pull Requests
|
||||
|
||||
Once you've committed your changes, please update your local master
|
||||
Once you've committed your changes, please update your local default
|
||||
branch and rebase your fix/feature branch against it before submitting a PR.
|
||||
|
||||
```
|
||||
git checkout master
|
||||
git checkout main
|
||||
git pull upstream HEAD
|
||||
|
||||
git checkout fix/style-detail-view-5678
|
||||
git rebase master
|
||||
git rebase main
|
||||
```
|
||||
|
||||
Once you've resolved any conflicts, push the branch to your remote repository.
|
||||
|
|
@ -147,22 +147,22 @@ Thanks a lot for your contribution!
|
|||
|
||||
### Rebase a Branch
|
||||
|
||||
If you accidentally sent in a PR which was not rebased against the upstream master,
|
||||
If you accidentally sent in a PR which was not rebased against the upstream default branch,
|
||||
developers might ask you to rebase your PR.
|
||||
|
||||
First off, fetch and pull `upstream` master.
|
||||
First off, fetch and pull the default branch.
|
||||
|
||||
```
|
||||
git checkout master
|
||||
git checkout main
|
||||
git fetch --all
|
||||
git pull upstream HEAD
|
||||
```
|
||||
|
||||
Then change to your working branch and start rebasing it against master:
|
||||
Then change to your working branch and start rebasing it against the default:
|
||||
|
||||
```
|
||||
git checkout fix/style-detail-view-5678
|
||||
git rebase master
|
||||
git rebase main
|
||||
```
|
||||
|
||||
If you are running into a conflict, rebase will stop and ask you to fix the problems.
|
||||
|
|
@ -195,7 +195,7 @@ If you fear to break things, do the rebase in a backup branch first and later re
|
|||
git checkout fix/style-detail-view-5678
|
||||
git checkout -b fix/style-detail-view-5678-rebase
|
||||
|
||||
git rebase master
|
||||
git rebase main
|
||||
|
||||
git branch -D fix/style-detail-view-5678
|
||||
git checkout -b fix/style-detail-view-5678
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
# Icinga DB Web
|
||||
|
||||
[](https://php.net/)
|
||||

|
||||

|
||||
[](https://github.com/Icinga/icingaweb2-module-icingadb)
|
||||
|
||||
Icinga DB is a set of components for publishing, synchronizing and
|
||||
|
|
|
|||
Loading…
Reference in a new issue