merge hotfix branch to release branch?

63 views
Skip to first unread message

Carlos Arturo Guerra Parra

unread,
May 18, 2013, 3:03:01 PM5/18/13
to gitflo...@googlegroups.com
I am a new gitflow user. It is really amazing, not only the software, but mainly the work-flow that I did not know.

But I have some doubt:

When you finish a hotfix branch, it is merged into develop and into master. Why is not there a merge to release?

I think it is better because the bug can be fixed also in release branch and this branch can be correctly tested without bug.
Maybe I am wrong, so I will be gratefull if somebody can explain me it.

Thank you very much!!!

Carlos.

Mateusz Loskot

unread,
May 18, 2013, 6:25:37 PM5/18/13
to gitflo...@googlegroups.com

Master is a release branch.
The branch named release/X.Y is just temporary workspace on a side until X.Y is released. Releasing means merge into master, thus master is equivalent to release branch afterwards. And, release/X.Y is deleted.
Finally hotfix goes to (released) master.
--

Mateusz  Loskot
(Sent from mobile, apology for top-posting and broken quotes)

--
You received this message because you are subscribed to the Google Groups "gitflow-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to gitflow-user...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
 
 
Reply all
Reply to author
Forward
0 new messages