Git Gud at Version Control

Version control at Scrum Booster

Version Control and Git Flow
Version control systems are a category of software tools that help a software team manage changes to source code over time. Version control software keeps track of every modification to the code in a special kind of database. If a mistake is made, developers can turn back the clock and compare earlier versions of the code to help fix the mistake while minimizing disruption to all team members. It’s a really helpful tool for developers team in developing their products!

In our team, we learned about git version control and its flow. There is a lot to learn but it’s a really useful tool to learn about. Here is the flow that we follow according to the best practices:

When working on a new change, a new user story, we create a new branch from staging called:

git checkout -b US-​<nomor_user_story>​-​<judul_user_story>

We name our commits with [RED], [GREEN], [CHORE], or [REFACTOR]. This simplifies reading the history, to show what someone was working on.

After finishing development with proper commits, we push our changes to the remote branch on Gitlab with:

git push origin US-​<nomor_user_story>​-​<judul_user_story>

We can easily collaborate without conflict using these user stories. All the code that is pushed to a branch is only to work on a specific user story, so changes and conflicts are easily tracked and taken care of. If needed we can also help out someone else’s branch by pushing changes to their branch. After it’s ready to merge, we create a merge request.