From 9cb44ed9fdb080f3d23ed7bca47015ab9bc0024f Mon Sep 17 00:00:00 2001 From: Johannes Meyer Date: Thu, 28 Sep 2023 14:23:54 +0200 Subject: [PATCH] Rename default branch to `main` --- .github/workflows/L10n-update.yml | 2 +- .github/workflows/php.yml | 4 ++-- CONTRIBUTING.md | 20 ++++++++++---------- README.md | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/L10n-update.yml b/.github/workflows/L10n-update.yml index 9dce59ae7..45599e8f0 100644 --- a/.github/workflows/L10n-update.yml +++ b/.github/workflows/L10n-update.yml @@ -3,7 +3,7 @@ name: L10n Update on: push: branches: - - master + - main jobs: trigger-update: diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index efdd41ae3..12d8544bf 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -3,11 +3,11 @@ name: PHP Tests on: push: branches: - - master + - main - release/* pull_request: branches: - - master + - main jobs: lint: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 15b07d742..3598597ce 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 diff --git a/README.md b/README.md index b9ed6e818..b81513f5a 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Icinga DB Web [![PHP Support](https://img.shields.io/badge/php-%3E%3D%207.2-777BB4?logo=PHP)](https://php.net/) -![Build Status](https://github.com/icinga/icingaweb2-module-icingadb/workflows/PHP%20Tests/badge.svg?branch=master) +![Build Status](https://github.com/icinga/icingaweb2-module-icingadb/workflows/PHP%20Tests/badge.svg?branch=main) [![Github Tag](https://img.shields.io/github/tag/Icinga/icingaweb2-module-icingadb.svg)](https://github.com/Icinga/icingaweb2-module-icingadb) Icinga DB is a set of components for publishing, synchronizing and