GitFlow

So what exactly are those gitflow menu items doing?

• Start New Feature

  1. Switch to the develop branch
  2. Pull latest changes on develop
  3. Create and switch to a new branch

• Finish Feature

  1. Switch to the develop branch
  2. Pull latest changes on develop
  3. Merge the feature branch to develop
  4. Delete the local feature branch
  5. Delete the remote feature branch
  6. Push all changes to develop

• Start New Release

  1. Switch to the develop branch
  2. Pull latest changes on develop
  3. Create and switch to a new release branch

• Finish Release

  1. Switch to the master branch
  2. Pull latest changes on master
  3. Merge the release branch to master
  4. Tag the release
  5. Switch to the develop branch
  6. Pull latest changes on develop
  7. Merge the release branch to develop
  8. Delete the local release branch
  9. Delete the remote release branch
  10. Push all changes to develop
  11. Push all changes to master
  12. Push the tag

• Start Hotfix

1. Switch to the master branch
2. Pull latest changes on master
3. Create and switch to a new hotfix branch

• Finish Hotfix

1. Switch to the master branch
2. Pull latest changes on master
3. Merge the hotfix branch to master
4. Tag the hotfix
5. Switch to the develop branch
6. Pull latest changes on develop
7. Merge the hotfix branch to develop
8. Push all changes to develop
9. Push all changes to master
10. Push the tag
11. Delete the local hotfix branch
12. Delete the remote hotfix branch