4th Street Bar Hive-Bar

Hive-Bar Powered by Hive beta-fdb5b5b

Community post

How to best use of Git -GitFlow

A successful Git branching model:

Master Branch:

  • origin/master to be the main branch where the source code of HEAD always reflects a production-ready state.
  • All of the changes should be merged back into master somehow and then tagged with a release number.

Develop Branch:

  • origin/develop to be the main branch where the source code of HEAD always reflects a state with the latest delivered development changes for the next release.

Gitflow Supporting Branches:

  • Feature
  • Release
  • Hotfix

Feature branches:

  • Must branch off from: develop
  • Must merge back into: develop
  • Branch naming convention: anything I prefer “JobNumber-JobTitle/#JIRATicketNumber”?

Release branches:

  • Must branch off from: develop
  • Must merge back into: develop + Master
  • Branch naming convention: anything I prefer “Release-*(ReleaseNumber)”.

HotFixes Branches:

  • Must branch off from: master
  • Must merge back into: develop + Master
  • Branch naming convention: I prefer “hotfix-*(#JIRATicketNumber)”

Summary:

Here is the Google slide link that I have created if anyone interested.

https://docs.google.com/presentation/d/18t1VhjoWoLx73GopDpEjvJ0kBPwMzZXrL2-kzJyjj_0/edit?usp=sharing:

Please let me know if you have any questions.

3 upvotes $0.00

Replies (2)

Review before signing

Posting as . Signing with . Keychain permission: Posting. Hive Keychain will ask you to approve this action next.


  
Technical details

Operation fingerprint: