diff options
| -rw-r--r-- | DEVELOP.md | 2 |
1 files changed, 1 insertions, 1 deletions
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: |