We have just upgraded to the latest version of bitbucket, which allows us to disable direct pushes to the master branch. Now we are using a version of the Github Flow process (ie cloning feature branches from the master branch), and can only use pull requests to merge from feature / bugfix branches to the master. We would like to perform our tests (some automated, some manual) while still working on the feature branch, and before merging onto the master branch. I was thinking of using the pull request cycle as follows:
- issue pull request for feature
- pull request approved by team
- test the feature
- after tests completed, merge to master
If we wait until after pushing to the master before testing, this might lead to bugs and regressions also being introduced onto the master.
My question is this. Since there is always the possibility that other users can merge to the master using other pull requests, this would mean that my pull request might have to be rebased to the updated state of the master if some time had elapsed after the pull request was initially opened. This means either performing the tests again, or locking the repository while at least one outstanding pull request is active. But locking the repository also has its problems, since no one else would be able to work.
Has anyone else come across this problem?
Thanks, Paul
Aucun commentaire:
Enregistrer un commentaire