Fix note about branch handling.
authorCarl Hetherington <cth@carlh.net>
Sat, 17 Feb 2024 23:37:47 +0000 (00:37 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 17 Feb 2024 23:37:47 +0000 (00:37 +0100)
DEVELOP.md

index 3ba1eeac2e16942b4af83b02f8ef0fb9eac5f16a..be8ed61e6891d2e30dbdd351cb3bd00d0f0be5bd 100644 (file)
@@ -29,7 +29,7 @@ As we have no `film' folder to log to during disk writes, the logs end up:
 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`
+* `v2.17.x` - development branch for v2.17.x versions; `main` is merged into this branch.
 
 The `test/data` submodule has the following branches: