HiveBrain v1.2.0
Get Started
← Back to all entries
patterngitMinor

What are the best practices of merging dev to master?

Submitted by: @import:stackexchange-devops··
0
Viewed 0 times
thewhatmergingaredevmasterpracticesbest

Problem

We have 2 branches (master/dev) + some feature branches and 2 environments (production/dev). Our team is a very small people. What are the best practices of merging dev to master?

  • Every morning?



  • After integration tests?



  • How about merging master with dev and then testing (hotfixes) then merging master to dev?



  • Some release branches?



I don't want to create anything too complicated.

Solution

You can use "git flow" or more simple "gitlab flow".

Our small team merge into master on release or sprint ends.

Context

StackExchange DevOps Q#6611, answer score: 3

Revisions (0)

No revisions yet.