diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-02-18 00:37:47 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-02-18 00:37:47 +0100 |
| commit | 647afe5df97a967b1d371ced536246e3ecc3a194 (patch) | |
| tree | e60add9a2e945992d75cc0f115793d020cc5632d /DEVELOP.md | |
| parent | 145177aeee61de5a893b3c58beefc9d840674213 (diff) | |
Fix note about branch handling.
Diffstat (limited to 'DEVELOP.md')
| -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: |