X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=DEVELOP.md;fp=DEVELOP.md;h=be8ed61e6891d2e30dbdd351cb3bd00d0f0be5bd;hp=3ba1eeac2e16942b4af83b02f8ef0fb9eac5f16a;hb=647afe5df97a967b1d371ced536246e3ecc3a194;hpb=145177aeee61de5a893b3c58beefc9d840674213

diff --git a/DEVELOP.md b/DEVELOP.md
index 3ba1eeac2..be8ed61e6 100644
--- a/DEVELOP.md
+++ b/DEVELOP.md
@@ -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: