Monday, December 22, 2014

Git Flow finishing a release

Once the release development / fix is completed, we have to finish the release branch, while finishing a release the updates (commits) from this branch will be merged with develop and master branches and the release branch will be deleted.

In the post Git flow starting a new Release, we saw on how to start a new release using git flow, and in the post “Git flow adding commits to a new Release” we saw on how to add / update changes to the new release. In this post we shall see on how to finish the changes made to the new release.
         

Git flow adding commits to a new Release

In the post Git flow starting a new Release, we saw on how to start a new release using git flow, in this post we shall see on adding / updating changes to the new release.

In this post I will be adding a new file to an existing release branch. Let me add a new file “Git Release.docx” to the new release branch Release1.

Git flow starting a new Release

A release is started when a feature development is completed and merged with the develop branch, once this is done a new release is created from the develop branch. The testing and big fixing activities will be carried out in the release branch. Once the code is stable without any issues, the release is finished; this will merge the changes made to the release branch to develop and main branches and delete the release branch.

In this post we shall see on how to create a new release (branch) and start working on the new release. In the post Creating a Git-Flow branching structure using Source Tree, we have seen on how to setup Git-flow. Once the setup is done you can follow the below steps to create a new release branch.

Sunday, December 21, 2014

Git Flow finishing a feature

Once the feature development is completed, we have to finish the feature branch, while finishing a feature the updates (commits) from this branch will be merged with develop branch and the feature branch will be deleted.

In the post Git flow starting a new Feature, we saw on how to start a new feature using git flow, and in the post Git flow adding commits to a new Feature we saw on how to add / update changes to the new feature. In this post we shall see on how to finish the changes made to the new feature.

Git flow adding commits to a new Feature

In the post Git flow starting a new Feature, we saw on how to start a new feature using git flow, in this post we shall see on adding / updating changes to the new feature.

In this post I will be adding a new file to an existing feature branch. Let me add a new file “Git Feature.docx” to the new feature branch feature1.