Set Gitlab development strategy
We need to establish a development strategy. Pim Schellart has proposed two alternatives:
-
Each developer has one personal branch, say users/pschella, users/hmunk etc.) that we work on and push to. Then we send merge request to master via gitlab and assign one of the others to review and merge.
-
We create a separate branch for each feature, preferably connected to an issue on the issue tracker (e.g. issue-42) and then send merge requests for those.
The second one has the advantage of having a single merge per issue and a good tracking between issues and code fixes. But it is a little more work as well.