This is a model for Git branching. In it there are two main branches, a master branch (which is what it sounds like) and a development branch which might be published to a UAT server if not a production server like master. Well, I'm assuming the part about the servers. The things to see really are that there is a master branch and a sister, almost equal, branch for development. The development branch gets branched by developers into feature branches and eventually the feature branches get merged back into the development branch. The development branch gets merged to master and the master branch gets merged back to development. Why does the master branch get merged back to development? Because hotfixes are branched off of the master branch and then merged back up to the master branch. git-flow might be gitflow without the hyphen. I'm not sure.
No comments:
Post a Comment