From b1bab3138a793e73de9672d92d6401721ec7cd3e Mon Sep 17 00:00:00 2001 From: SusanQuigley Date: Tue, 17 Jan 2023 16:18:43 +0000 Subject: [PATCH] Update 'README.md' Added info about temporary branches --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b62fbd86..b652ee89 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,5 @@ To view the repository of the Unlocked *Dynamic* Bible, go to [WycliffeAssociate If you are a contributor to this ULB project, please add your name to the contributor field in the [manifest.yaml](https://git.door43.org/WycliffeAssociates/en_ulb/src/branch/master/manifest.yaml) file. If you will be editing this ULB, please see [Introduction to the ULB] (https://git.door43.org/WycliffeAssociates/en_ulb/src/branch/master/00-About_the_ULB/ULB-1-Intro.md) and [Decisions Concerning the ULB] (https://git.door43.org/WycliffeAssociates/en_ulb/src/branch/master/00-About_the_ULB/ULB-2-Decisions.md). - +## Branches +We do not make changes in the master branch. If we were to do that, the version accessible through BIEL would be updated each time a change is made while the version in the translation apps would not. This causes confusion when people find that the versions they are looking at are different. So instead, we make our changes in a temporary branch. When it is decided to merge the temporary branch into the master branch, IT will also update the version in all the apps. In January 2023, we started a new branch called June23. We expect to merge it in June 2023 at the end of the winter volunteer season. At that time we will need to start a new branch--perhaps called December 2023.