This PR adds instructions for gatekeepers when fixing a merge conflict between protected branches (e.g. between main and release-next. The key is to make sure a PR is created to resolve the conflict, rather than pushing straight to main.
To test:
A gatekeeper should review this.
Read the instructions and build the dev docs. Will these instructions work in all cases? Was there a reason to push directly to main previously?
If fixing a conflict via a branch is a good idea, is it better to use git rebase rather than git merge? Or is git merge preferred in this instance?
Reviewer
Please comment on the points listed below (full description).
Your comments will be used as part of the gatekeeper process, so please comment clearly on what you have checked during your review. If changes are made to the PR during the review process then your final comment will be the most important for gatekeepers. In this comment you should make it clear why any earlier review is still valid, or confirm that all requested changes have been addressed.
Do changes function as described? Add comments below that describe the tests performed?
Do the changes handle unexpected situations, e.g. bad input?
Has the relevant (user and developer) documentation been added/updated?
Does everything look good? Mark the review as Approve. A member of @mantidproject/gatekeepers will take care of it.
Gatekeeper
If you need to request changes to a PR then please add a comment and set the review status to "Request changes". This will stop the PR from showing up in the list for other gatekeepers.
Description of work
This PR adds instructions for gatekeepers when fixing a merge conflict between protected branches (e.g. between
mainandrelease-next. The key is to make sure a PR is created to resolve the conflict, rather than pushing straight tomain.To test:
A gatekeeper should review this.
Read the instructions and build the dev docs. Will these instructions work in all cases? Was there a reason to push directly to main previously?
If fixing a conflict via a branch is a good idea, is it better to use
git rebaserather thangit merge? Or isgit mergepreferred in this instance?Reviewer
Please comment on the points listed below (full description). Your comments will be used as part of the gatekeeper process, so please comment clearly on what you have checked during your review. If changes are made to the PR during the review process then your final comment will be the most important for gatekeepers. In this comment you should make it clear why any earlier review is still valid, or confirm that all requested changes have been addressed.
Code Review
Functional Tests
Does everything look good? Mark the review as Approve. A member of
@mantidproject/gatekeeperswill take care of it.Gatekeeper
If you need to request changes to a PR then please add a comment and set the review status to "Request changes". This will stop the PR from showing up in the list for other gatekeepers.