Skip to content

Commit d38ed40

Browse files
authored
Contribution Guidelines: Require contributions to target in-dev (#1260)
1 parent 2e5596b commit d38ed40

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,5 @@ This repository uses the following branches:
99
* **_master_** is our main branch. We consider it stable and it is used in production.
1010
* The **_releaseXX_** branches are our in-development branches. When a release is ready, we decide to “freeze” that branch and create a new **_releaseXX+1_** branch.
1111

12-
We encourage you to base your contributions on the latest **_releaseXX_** branch, alternatively the **_master_** branch or a recently frozen **_releaseXX_** branch. The [_Sofie Releases_](https://nrkno.github.io/sofie-core/releases) page collects the status and timeline of the releases.
12+
We require contributions to be based based on the latest **_release\*_** branch.
13+
The [_Sofie Releases_](https://nrkno.github.io/sofie-core/releases) page collects the status and timeline of the releases.

packages/documentation/docs/for-developers/contribution-guidelines.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ sidebar_position: 2
77

88
# Contribution Guidelines
99

10+
_Last updated september 2024_
11+
1012
## About the Sofie TV Studio Automation Project
1113

1214
The Sofie project includes a number of open source applications and libraries developed and maintained by the Norwegian public service broadcaster, [NRK](https://www.nrk.no/about/). Sofie has been used to produce live shows at NRK since September 2018.
@@ -35,8 +37,8 @@ However, Sofie is a big project with many differing users and use cases. **Large
3537
3. (If needed) NRK establishes contact with the RFC author, who will be invited to a workshop where the RFC is discussed. Meeting notes are published publicly on the RFC thread.
3638
4. The contributor references the RFC when a pull request is ready.
3739

38-
### Base contributions on the in-development branch (or the master branch)
39-
In order to facilitate merging, we ask that contributions are based on the latest (at the time of the pull request) _in-development_ branch (often named `release*`), alternatively the stable (eg. `master`) branch. NRK will take responsibility for rebasing stable contributions to the latest in-development branch if needed.
40+
### Base contributions on the in-development branch
41+
In order to facilitate merging, we ask that contributions are based on the latest (at the time of the pull request) _in-development_ branch (often named `release*`).
4042
See **CONTRIBUTING.md** in each official repository for details on which branch to use as a base for contributions.
4143

4244
## Developer Guidelines

0 commit comments

Comments
 (0)