Git Workflow

In this repository, there are both changes to the content (e.g. texts, pictures) and development changes (e.g. new features, layout changes - "programmer work"). As both of these changes need to be reviewed, but by different people (specialists for each area), there are branches for each area - the 'content branch' and the 'development branch'. In these branches, the changes in content and in coding/development are made, respectively.

There is also the 'main' branch, which is, as the name suggests, the most important one. All changes that are made in the 'main' branch are visible on the website! So before changes are made here, they need to be checked.

When different people work simultaneously on the 'content' and 'development' branch, there are problems that can occur and that we need to avoid. Specifically, if two people change something in the same file, it can happen that a so-called merge conflict occurs (git doesn't know how to merge the two changes, as they occured in the same place in the same file). These can usually be resolved quite quickly, but it should be done by an experienced person.

So we created a workflow which ensures, that these merge conflicts can only occur when a developer makes changes.

The workflow is primarily about the order in which new changes that were made in the 'content' and 'development' branches are merged into each other and the 'main' branch. The following picture gives an overview.