On Fri, Apr 1, 2016 at 2:41 AM, Misha Shnurapet <misha@gnome.org> wrote:

Hello.

It's not clear how the branches are related throughout multiple release cycles.

Fixing a translation error, do I have to edit all the branches I can
find? What is master branch for? How is it related f24-branch? Where
do I put fixes? Are rhel*-branches to be translated?

Hi Misha,

Here is my experiences on branch and translation bugs fixing. Hope it can help you.

Master is the main branch, which will continue to update, and be branched to other branches if needed during developing process.

f24-branch is the branch used only for upcoming release Fedora 24.

rhel branches are used for RHEL releases.

If you need to fix a bug, first is to know where is it from, for example the release number, Fedora 24.

Then you may go to the correct branch, i.e. f24-branch and make your fixes. If the bug exist in master too, you should fix it again in master. So it won't affect any future branches.

Regards,

Tian Shixiong
Fedora Project Contributor