From 647afe5df97a967b1d371ced536246e3ecc3a194 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 18 Feb 2024 00:37:47 +0100 Subject: [PATCH] Fix note about branch handling. --- DEVELOP.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: -- 2.30.2