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.

1.    Open Source Tree.

2.    Click on the Git Flow icon in the tool bar.

3.    A pop-up window appears, with the available options.

4.    In our case we have a feature branch “Feature1”, we will finish changes done in this branch by clicking on the Finish Feature button.

5.    Select the feature to be finished, in our case the feature is Feature1

6.    Make sure that the delete branch checkbox is checked, this will delete the feature branch post-merger and will make a clean branching structure. Click Ok.

       7. Notice that the new feature branch is removed, the changes done in this branch are

now merged to the develop branch and the feature branch is deleted.

8.    Push the changes, so that the branch merger and deletion updates are pushed to the remote repository.

9. If the feature branch is not deleted from the remote repository, you can manually delete this branch from the remote repository since the changes are already merged to the develop branch.

10. That’s it the new feature is now merged with the main develop branch and is now ready for release.