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

Launching a Jupyter Notebook with TensorFlow using Docker

This article will walk you through setting up a Jupyter Notebook environment with TensorFlow pre-installed using Docker. Docker allows you to run isolated containerized applications, providing a consistent environment regardless of your underlying operating system. Prerequisites: Docker: Ensure you have Docker installed and running on your system. You can download and install it from the official Docker website ( https://www.docker.com/ ). Steps: Start Docker: Open your Docker application (Docker Desktop for Windows/macOS or the command line if using Linux). Run the Jupyter Notebook container: For macOS/Linux: Open your terminal application and run the following command: docker run -it --rm -p 8888:8888 -v "${PWD}":/home/jovyan/work jupyter/tensorflow-notebook For Windows: Open your Command Prompt application and run the following command: docker run -it --rm -p 8888:8888 -v "%CD%":/home/jovyan/work jupyter/tensorflow-notebook Explanation of the command flags: -...
Post a Comment
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