branching strategy in your company

Our test framework is separate repo from the
application code repo. Automation framework 
has a smaller code base, and fewer people are involved.
so we do not have a very complicated branching strategy
	We have master and develop branches(buffer branch)
    in our automation framework repository.
    Once I have a story from jira, I create a
    new branch from the develop branch with the
    issue number of my jira story and check out.
	git branch <branchName>
	git checkout -b vyt-59I 
	write my automated tests on this branch.
    Once completed, I create a pull request 
    so that my code can be reviewed. Once my 
    team reviews the code, my branch is merged into develop.  
	After code is merged, I delete the branch. 
	git branch -d <branch_name>
	Then get another story from jira, 
    create new branch for that one ... 
	At the end of every sprint, (or quarter)
    we merge with master. 
	My daily automated smoke 
    from Jenkins runs against the master branch. 
	Master branch is stable since 
    we only merge into with once a sprint.

View another examples Add Own solution

4.67

EPH 105 points

                                    Our test framework is separate repo from the
application code repo. Automation framework 
has a smaller code base, and fewer people
are involved. so we do not have a very 
complicated branching strategy
We have master and develop branches(buffer branch)
in our automation framework repository.
Once I have a story from jira, I create
a new branch from the develop branch with
the issue number of my jira story and check out.
git branch &lt;branchName&gt;
git checkout -b vyt-59I 
write my automated tests on this branch.
Once completed, I create a pull request
so that my code can be reviewed. Once my team
reviews the code, my branch is merged into develop.  
After code is merged, I delete the branch. 
git branch -d &lt;branch_name&gt;
Then get another story from jira, create
new branch for that one ... At the end of every
sprint, (or quarter) we merge with master. 
My daily automated smoke from Jenkins runs 
against the master branch. 
Master branch is stable since we only
merge into with once a sprint.

Thank you! 6

4.67 (6 Votes)

4.11

CharlieATX 100 points

                                    Our test framework is separate repo from the
application code repo. Automation framework 
has a smaller code base, and fewer people
are involved. so we do not have a very 
complicated branching strategy
We have master and develop branches(buffer branch)
in our automation framework repository.
Once I have a story from jira, I create
a new branch from the develop branch with
the issue number of my jira story and check out.
git branch &lt;branchName&gt;
git checkout -b vyt-59I 
write my automated tests on this branch.
Once completed, I create a pull request
so that my code can be reviewed. Once my team
reviews the code, my branch is merged into develop.  
After code is merged, I delete the branch. 
git branch -d &lt;branch_name&gt;
Then get another story from jira, create
new branch for that one ... At the end of every
sprint, (or quarter) we merge with master. 
My daily automated smoke from Jenkins runs 
against the master branch. 
Master branch is stable since we only
merge into with once a sprint.

Thank you! 9

4.11 (9 Votes)

Are there any code examples left?

Find Add Code snippet

New code examples in category Shell/Bash

Shell/Bash 2022-03-27 22:30:33 wise highlight ubuntu
Shell/Bash 2022-03-27 22:25:19 how to send a pull request in git
Shell/Bash 2022-03-27 22:00:06 could not find 21 android x assemblies make sure to install the following nuget packages
Shell/Bash 2022-03-27 21:55:06 how to open terminal in sublime text ubuntu
Shell/Bash 2022-03-27 21:25:19 how to switch branch
Shell/Bash 2022-03-27 21:20:25 python
Shell/Bash 2022-03-27 21:20:04 set user as admin gitlab
Shell/Bash 2022-03-27 21:10:09 apache2 mod_jk proxy to tomcat connector
Shell/Bash 2022-03-27 20:35:12 chown
Shell/Bash 2022-03-27 20:15:08 awk last match

Create a Free Account

Unlock the power of data and AI by diving into Python, ChatGPT, SQL, Power BI, and beyond.

Develop soft skills on BrainApps

Complete the IQ Test

Relative searches

what is your branching strategy how to work with paraleel development branch work flow what is branching strategy in your company how is branching in your company best branch strategy release branching strategy in your company

branching strategy in your company

Welcome Back!

Create a Free Account