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:
- Why doesn't bitbucket have a revert function?
- 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.