Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

Preventing two branches from being merged

Benjamin Nutting June 17, 2020

Our branch structure is master and integration. When we get new JIRA tickets we create a new branch off of master, do our work, commit to our new branch, merge with integration, test, if all goes well then we take the same branch and merge with master. Rinse and repeat.

Yesterday we accidentally merged integration with master which accidentally rolled out a ton of not ready code went to production. So two questions:

  1. Why doesn't bitbucket have a revert function?
  2. How to we prevent integration from being merged with master.

There is NEVER a use case for us that we would want to merge integration with master.

1 answer

1 vote
Lenny Dennis June 20, 2020

Hi @Benjamin Nutting 

On preventing other branches from being merged with master. You can be guided by this link https://confluence.atlassian.com/bitbucketserver/using-branch-permissions-776639807.html

Regards Lenny

Suggest an answer

Log in or Sign up to answer
DEPLOYMENT TYPE
SERVER
VERSION
6.0.0
TAGS
AUG Leaders

Atlassian Community Events