Git flow

To manage this project we are using git version control (as you might have noticed since we are on Gitlab..).

The idea is that for every new feature or issue a new feature branch is created. So the branch name should be feature/name. This ensures that there is a clear distinction between branches. If you have finished a feature you can issue a pull request for the branch which means it can be merged by an admin.

As you can see there are currently 3 branches present. A master, develop and uat branch. The master is the production branch which will contain the latest stable version of the project. The develop branch is where we make new features and this is to where you can create pull requests for feature branches. The uat branch or user acceptance test is the branch which can be seen as a beta branch. The developers have used it and made sure everything works but the product owners still have to do an acceptance test to see if it can be pushed to the production branch aka main.

A good program to utilize to make sure you follow this git flow is GitKraken. It has an easy way to follow a git flow and make sure you utilize the feature branches and pull requests.

It can also help to read the Gitlab docs on git(lab) flow to get some more clariy on how this all works. In short you can see main as production, uat as beta and develop as nightly builds.