Feature Finish

Step 1: Finish feature development

Once you have verified the changes you made and is ready to merge to develop branch.Finish the development of a feature by executing git flow feature finish change-color.

ConsoleAccess:~/environment/gitflow-workshop (feature/change-color) $ git flow feature finish change-color

This action performs the following:

  • Merges change-color into develop

  • Removes the feature branch

  • Switches back to develop branch

Step 2: Delete the feature branch change-color and push it to remote at the same time.

ConsoleAccess:~/environment/gitflow-workshop (develop) $ git push origin --delete feature/change-color                                                                                                                            
To https://git-codecommit.us-east-1.amazonaws.com/v1/repos/gitflow-workshop
 - [deleted]         feature/change-color

This step will trigger the DeleteBranch lambda function you created earlier and will delete the gitflow-workshop-feature-change-color Elastic Beanstalk environment and gitflow-workshop-feature-change-color-pipeline Code Pipleline.

feature-finish-cfn feature-finish-eb

Step 3: Push the develop branch changes to codecommit.

ConsoleAccess:~/environment/gitflow-workshop (develop) $ git push --set-upstream origin develop

And you should see the output something similar to:

Counting objects: 3, done.
Compressing objects: 100% (3/3), done.
Writing objects: 100% (3/3), 294 bytes | 294.00 KiB/s, done.
Total 3 (delta 2), reused 0 (delta 0)
To https://git-codecommit.us-east-1.amazonaws.com/v1/repos/gitflow-workshop
   d33e3e3..ac9881b  develop -> develop
Branch develop set up to track remote branch develop from origin.

Amazon CloudWatch Events rule detects changes in the develop branch it starts the pipeline. To verify your pipeline ran successfully, monitor the progress of the pipeline gitflow-workshop-develop-pipeline as it moves through each stage by going to CodePipeline Console. After the pipeline ran successfully, go to the environment URL for the gitflow-workshop-develop application to see the latest changes.