How to log & track multi-branch code for software development stories

Question

Im looking to the community to help me find a good way of accounting, and also tracking, work that touches multiple branches in Git.

For example, a story has code that was meant to be completed in Release version 1. Then its determined that we need to bump some of that work to Release version 1.A, and it might also touch code in other branches as well.

Currently, I am creating clones of the same story and marking them in the title with the branch to test against. I.e.

* (1) Story One
* (1.A) Story One
* etc., etc...

The reason behind doing this is so that developers as well as QA engineers know where to commit and test code for that story. However, this method is very manual and very cumbersome. Having multiple clones of basically the same story over and over again isnt efficient.

My first solution was to use CheckList (Jira add-on) and have a running template list of branch options on the story. Or a Custome Field that is multi-select with branch names (This one would require lots of maintenance by constantly updating the applicable options).

Thoughts?

Humashankar VJ · Answer

Hi @Wes April

To efficiently track multi-branch code for software development stories in Jira, consider implementing a streamlined approach that eliminates the need for multiple story clones. This can be achieved through several strategies.

* Firstly, create custom fields: "Affected Branches" (multi-select) to track multiple branches per story, and "Branch Status" (table/grid) to monitor story status across branches.
* Leverage Jira's automation capabilities to manage branch-related actions, such as updating "Affected Branches" when a new branch is created or linked to an issue, and transitioning issue status based on branch activities.
* Integrate your version control system (e.g., Bitbucket, GitHub) with Jira to automatically link branches and commits to issues. Utilize smart commits to update Jira issues directly from commit messages.
* Modify your Jira workflow to accommodate multi-branch development by adding a "Branch Review" status and transitions for different branches.

Instead of cloning stories, use subtasks for branch-specific work, naming them with the branch (e.g., "[Branch: 1.A] Implement feature X").

Encourage effective commenting with branch mentions and @mentions for updates.

Create custom reports and dashboards to visualize multi-branch work, using JQL queries to filter issues by affected branches.

By implementing these strategies, you'll gain better visibility into the development process, reduce manual work, and improve overall efficiency in managing complex, multi-branch projects in Jira.

Some helpful articles –

* Solved: Connection two issues to one branch
* [JRASERVER-7886] Fixes at different times across multiple versions / branches - best practice & custom field - Create and track feature requests for Atlassian products.
* Branch automation rules to perform actions on related issues | Automation for Jira Cloud and Data Center | Atlassian Documentation
* version control - git - multiple JIRA tasks, multiple branches, same file - Stack Overflow

Hope this helps - Happy to help further!!
Thank you very much and have a great one!
Warm regards