diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 38e2a74ac967c9817de7f267bd7566afb92a0445..93d2c10d9c12e3c20e59722cc770ed7782f9e3ff 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,7 +120,7 @@ deploy: stage: deploy only: refs: - - master + - main - devel - tags variables: diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2bceabddaecbc45bac95b71680057c4bd0160bc7..8694506ec4c57743db3ff2e359b5902e782e7b1a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -12,15 +12,15 @@ __Project Maintainers:__ The _Project Manager_'s role is to keep an overview of the development happening in labRemote. The PM's responsibilities include: - being the main contact for labRemote -- regularly merging the `devel` branch into `master` +- regularly merging the `devel` branch into `main` - merging all Merge Requests The _Maintainers_ have a very good knowledge of the labRemote code base and are responsible for reviewing Merge Requests. ## Usage of The devel Branch -The `master` branch is to be assumed as relatively stable. All new development should be merged into the `devel` branch. The `devel` branch is __not__ to be used for applications! +The `main` branch is to be assumed as relatively stable. All new development should be merged into the `devel` branch. The `devel` branch is __not__ to be used for applications! -The `devel` branch will be merged into `master` every Monday, with weeks skipped based on the Project Manager's discretion. +The `devel` branch will be merged into `main` every Monday, with weeks skipped based on the Project Manager's discretion. ## Making Changes to labRemote