From: Carl Hetherington <cth@carlh.net>
Date: Fri, 13 Jan 2023 21:53:52 +0000 (+0100)
Subject: Add some branch notes to DEVELOP.md
X-Git-Tag: v2.16.41~58
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=abcd6c9182507e6336a1839661dac856d5bea553

Add some branch notes to DEVELOP.md
---

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