Skip to main content

Git Flow based branch naming convention

Git flow is a branching model for Git that helps large teams collaborate on projects.

There are several best practices for naming Git branches. One of them is to begin with unique IDs like JIRA ID followed by JIRA title in the branch names. You can use hyphen as separators and avoid using numbers only.

You can also use Git flow's naming conventions, which are based on the type of branch you're creating. For example, feature branches should be named `feature/branch-name`, release branches should be named `release/version-number`, hotfix branches should be named `hotfix/branch-name`, and bugfix branches should be named `bugfix/branch-name`.

So our branch names syntax could be like

<work-type>/<jira-id>-<jira-title>

for e.g.,
  • feature/AIQ-12345-summary-title-of-enhancement-task
  • hotfix/AIQ-12345-summary-title-of-hotfix-task
  • bugfix/AIQ-12345-summary-title-of-bugfix-task
  • release/AIQ-12345-summary-title-of-release-task
If you make the branches from jira website then this could be automatically taken care of and you just need to select work-type from the drop down while creating new branch via bitbucket.

Comments

Post a Comment

Popular posts from this blog

Unlock protected blocks in Siemens SIMATIC Step 7

Recently I'd been called by Hindalco's Fabrication Plant division to unlock the protected blocks in Siemens SIMATIC Step 7. They were in need to unlock those blocks since an year because of 1 million Rupees of loss per month. They want to re-program those blocks but it was locked by the man who'd done the setup. From the people working in that department, I came to know that they were trying to call that man (someone from Italy) right here but he's not coming. Actually, what he'd done was that he'd locked some of the blocks and deleted the source file. And Siemens didn't provide any feature to unlock. Department people also told me that even the people working in Siemens don't know how to do it. Being a software engineer I know that any thing can be reverse engineered. So I took up the challenge. How did I unlocked the blocks? The first thing I'd done was searched about this software at Google and read about what is this software all about. Aft...
50 comments
Read more

JS: The complete code example of Crypto.js (DES)

For one of the project I was trying to use crypto.js but I found that the Quick-start Guide have some deficiency in terms of library usage. So I am writing it here as a useful note for memory recap. <script src="http://crypto-js.googlecode.com/svn/tags/3.1.2/build/rollups/tripledes.js"></script> <script> var encrypted = CryptoJS.DES.encrypt("The secret message", "secret_key"); var e_msg = encrypted.toString(); console.log(e_msg); var decrypted = CryptoJS.DES.decrypt(e_msg, "secret_key"); var d_msg = decrypted.toString(CryptoJS.enc.Utf8); console.log(d_msg); </script>
4 comments
Read more

Openmeetings Widget Wordpress Plugin

One of my client asked me to create a Wordpress plugin, so the first thing I did was to search for any existing plugin on which I can work on. Luckily I found one. It was developed by Shuki Vaknin. You can visit his plugin at:  http://wordpress.org/extend/plugins/openmeetings-integration-plugin-widget/ But I had little different requirement. So I modified the Shuki Vaknin's plugin. The modification is that every session has a unique username. I choose guest as default name while adding a timestamp along with guest keyword like guest34578689 . Download Link:  openmeetings-integration-plugin-widget.zip
6 comments
Read more