diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-01-13 22:53:52 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-01-14 00:42:39 +0100 |
| commit | abcd6c9182507e6336a1839661dac856d5bea553 (patch) | |
| tree | 91cb38fff2c43c6f412c9a97b9a416898bf873e6 | |
| parent | 0c66eff01358e75ff524f395aeb634ec34a47313 (diff) | |
Add some branch notes to DEVELOP.md
| -rw-r--r-- | DEVELOP.md | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/DEVELOP.md b/DEVELOP.md index c89fe1601..78231b89e 100644 --- a/DEVELOP.md +++ b/DEVELOP.md @@ -4,6 +4,19 @@ This file collects a few notes relevant to DCP-o-matic developers. There is als [on the web site](https://dcpomatic.com/development). +## Branches + +The main dcpomatic repo has the following branches: + +* `main` - the main development branch; contains 2.16.x versions +* `v2.17.x` - development branch for v2.17.x versions; periodically rebased onto `main` + +The `test/data` submodule has the following branches: + +* `v2.16.x` - branch for use with v2.16.x versions +* `v2.18.x` - branch for use with v2.17.x versions (as will become v2.18.x) + + ## Player stress testing If you configure DCP-o-matic with `--enable-player-stress-test` you can make a script which |