How to best use of Git -GitFlow

in git •  7 years ago 

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.

Authors get paid when people like you upvote their post.
If you enjoyed what you read here, create your account today and start earning FREE STEEM!
Sort Order:  

Congratulations @dheerajp! You received a personal award!

1 Year on Steemit

Click here to view your Board of Honor

Do not miss the last post from @steemitboard:

Saint Nicholas challenge for good boys and girls

Support SteemitBoard's project! Vote for its witness and get one more award!

Congratulations @dheerajp! You received a personal award!

Happy Birthday! - You are on the Steem blockchain for 2 years!

You can view your badges on your Steem Board and compare to others on the Steem Ranking

Vote for @Steemitboard as a witness to get one more award and increased upvotes!