Using GitFlow

There are several branching models:

• Centralized

  • Uses a centralized repository
  • End users clone the repository
  • Pull changes from central repository to local
  • Push local changes to central repository
  • Like SVN model

  

• Feature Branch

  • Same as centralized
  • Except that each for each feature a new branch is created
  • And after the feature branch is completed it will be merged to the main master

• GitFlow
• Others

What is GitFlow

More complicated than feature branch model. It uses more branches and more functionality, more things to manage. More flexibility.

Two branches which track all code changes: master, develop

Additional branches: feature, hotfix, release

hotfixbranches must be integrated into masterand developbranches.

releasebranches must track additional hotfixes for that release. Changes must be integrated to developbranch. When release is made this branch could be deleted.

Installing GitFlow

https://github.com/nvie/gitflow/wiki

References

https://app.pluralsight.com/library/courses/using-gitflow/table-of-contents