DOKK Library

Git branching model

Authors Vincent Driessen

License CC-BY-SA

Plaintext
                                                             release
                        feature
                                          develop           branches                  hotfixes     master
                       branches




                                                                                                            Tag
Time



                                                                                                            0.1



                           Major                                        Severe bug
                         feature for                                      fixed for
        Feature
                        next release                                    production:
       for future                                                        hotfix 0.2
        release

                                                       Incorporate
                                                         bugfix in
                                                         develop


                                                                                                            Tag
                                                                                                            0.2



                                                                               Start of
                                                                               release
                                                                              branch for

                    From this point on,                                          1.0
                       “next release”
                    means the release
                         after 1.0


                                                                                Only
                                                                              bugfixes!




                                                        Bugfixes from                                       Tag
                                                         rel. branch
                                                           may be                                           1.0
                                                        continuously
                                                        merged back
                                                        into develop




                                                Author: Vincent Driessen
                       Original blog post: http://nvie.com/posts/a-succesful-git-branching-model
                                           License: Creative Commons BY-SA