Git Flow finishing a hotfix

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

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

Git flow adding commits to a new Hotfix

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

In this post I will be adding a new file to an existing hotfix branch. Let me add a new file “Git Hotfix.docx” to the new hotfix branch Hotfix1.

Git flow starting a new Hotfix

A Hotfix is started when there are bugs / issues in production. Starting a hotfix creates a new hotfix branch from the master branch. The testing and big fixing activities will be carried out in the hotfix branch. Once the code is stable without any issues, the hotfix is finished; this will merge the changes made to the hotfix branch to develop and main branches and delete the hotfix 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 usingSource 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.

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.

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 release branch “Release1”, we will finish changes done in this branch by clicking on the Finish Release button.

5.  Select the release to be finished, in our case the release is Release1

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

7. Notice that the new release branch is removed, the changes done in this branch are now merged to the develop and master branches and the release branch is deleted.

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

9. If the release 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 and master branches.

10.  That’s it the new release is now merged with the main develop and master branches and is now ready for production deployment.

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 we will add a new file to an existing release branch. Let me add a new file “Git Release.docx” to the new release branch Release1.

1.    Open Source Tree.

2.    Make sure that the new release branch to which changes are to be make is checked out as the current branch.

3.    Add a new file / update an existing file in the local working folder.

4.    I am going to add a new file “Git Release.docx” to the working folder.

5.    Stage and commit the new file to the repository.

6.    Push the changes to the remote repository.

7.    This will push the added / updated changes to the remote repository.

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.
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. Click on the Start new Release button.
5. Give a name to the new release, I have given the name as “Release1”, select the latest development branch option and click Create.

6. This will create a new release and set the new release branch as the current working branch.

7.    Any updates, commits done will be added to this branch.
8. Push the changes, so that the new branch gets added to the remote repository, so that other developers working on the new release can also use the same branch.

9.    Now the new release is ready for development / bug fixing.

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.         

         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 release branch “Release1”, we will finish changes done in this                branch by clicking on the Finish Release button.

        5. Select the release to be finished, in our case the release is Release1

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

       7. Notice that the new release branch is removed, the changes done in this branch                      are now merged to the develop and master branches and the release branch is                      deleted.               

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

        9.  If the release 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 and master branches.

           10.            That’s it the new release is now merged with the main develop and master                             branches and is now ready for production deployment.

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.

1.    Open Source Tree.

2.    Make sure that the new release branch to which changes are to be make is checked out as the current branch.

3.    Add a new file / update an existing file in the local working folder.

4.    I am going to add a new file “Git Release.docx” to the working folder.

5.    Stage and commit the new file to the repository.

               6. Push the changes to the remote repository.

7.    This will push the added / updated changes to the remote repository.

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.

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. Click on the Start new Release button.

5. Give a name to the new release, I have given the name as “Release1”, select the latest development branch option and click Create.

6.    This will create a new release and set the new release branch as the current working branch.

7.    Any updates, commits done will be added to this branch.

8. Push the changes, so that the new branch gets added to the remote repository, so that other 

developers working on the new release can also use the same branch.

9.    Now the new release is ready for development / bug fixing.

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.

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.

1.    Open Source Tree.

2.    Make sure that the new feature branch to which changes are to be make is checked out as the current branch.

3.    Add a new file / update an existing file in the local working folder.

4.    I am going to add a new file “Git Feature.docx” to the working folder.

5.    Stage and commit the new file to the repository.

          6. Push the changes to the remote repository.

7. This will push the added / updated changes to the remote repository.

Git flow starting a new Feature

A feature is started when we want to develop a new module to an application, creating a feature creates a new branch from the develop branch, all additions/changes done for the feature will be committed to the feature branch, finally when the feature development is completed, the feature is finished, this will merge the changes (commits) made to the develop branch and delete the feature branch.

In this post we shall see on how to create a new feature (branch) and start working on the new feature. In the post Creating a Git-Flow branching structure usingSource 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 feature branch.

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.    Click on the Start new Feature button.
5.    Give a name to the new feature, I have given the name as “Feature1”, select the latest development branch option and click Create.

6.  This will create a new feature and set the new feature branch as the current working branch.

7.    Any updates, commits done will be added to this branch.
8. Push the changes, so that the new branch gets added to the remote repository, so that other developers working on the new feature can also use the same branch.

9.    Now the new feature is ready for development.