Branching model

master/main branch (origin/HEAD)

The master or main branch is the live-version and should be the live-deployed (or about to be deployed) version. Don’t ever force-push to master/main. If you break the master/main branch, fix it immediately and inform the other developers on slack. If it seems to be a longer problem, go back to a good commit (reverse your commit/merge) and repair it on your own branch.

Feature branches

Create feature-branches for your work as you need them. We don’t have a strict convention for naming, but it’s often helpful to include a ticket-number and to choose a somewhat descriptive name.

• You can create commits as you want, can push-force as you wish. As long as we get clean commits in master/main.
• You should push the branch to GitHub regularly so you have a backup of your work.
• Don’t mess around with branches of other developers.