DEV Community

Discussion on: Git-flow, non-technical intro.

Collapse
 
polyterative profile image
Vladyslav Yakovenko • Edited

The first step is to understand what problem gitflow is trying to solve and if gitflow can actually help.
In our case it happens very often that two or three people work on the same project.

Creating a branch for each feature allows us to create a situation where conflicts are rare and when they arise they are manageable.

Using github gitlab is very convenient because it allows you to "automate" the creation of branches and their closing (merging).
I personally also prefer to squashing branches in order to get a commit per feature.

Thread Thread
 
theowlsden profile image
Shaquil Maria

Great! Thank you for this comment!

I personally also prefer to squashing branches in order to get a commit per feature.

I'll have to look into that too.