re: How to Use Git Merge [the Correct Way] VIEW POST

TOP OF THREAD FULL DISCUSSION
re: By separating each feature, bugfix or working experiment you will avoid a lot of problems and keep your development branches clean. Actually, I d...
 

Hey, Jan, I understand your point, merging can cause some frustration, especially when conflicts happen.

Kolosek team prefers to create a new branch for each feature unless it is a hotfix or emergency bug fix. In this case, we commit directly to master or development.

To ensure the code is "clean" we always have someone to check the Pull Request before merging the feature branches. This is another reason why we mostly go with feature branches.

code of conduct - report abuse