Merge requests#

The following are guidelines. It is up to the maintainers of the repository how they handle merge requests.

Review#

Please only merge open merge requests (MRs) after review. This should ideally include testing the changed code paths by someone that is not the submitter.

Merging merge requests#

We use Marge Bot for merging merge requests so instead of merging directly just assign the MR to the margebot GitLab CI user. This will rebase the MR and merge it if the pipeline succeeds.

Should the pipeline fail it will reassign the MR back to the person that created the MR. In that case, check if this is due to a CI hiccup or a flaky test. In that case retrigger that specific job and if it succeeds reassign to Marge Bot.

Reviewing merge requests#

Please take the time to review other Phosh maintainers’ merge requests. Even if you’re not deeply familiar with the code, as it helps to catch obvious mistakes, simple things the submitter overlooked, etc.

If nobody shows up to review your merge request although it has generated some noise (because you pinged other maintainers or pushed several versions and commented on them) wait at least 7 days after the last non-trivial change. If it then sat quiet for a week you can self-merge. This should be avoided though, if possible.

Build breaker rule#

If the build has been broken by a merged MR or an infra change a minimal patch to fix this can be merged right away (but ideally seek a quick review e.g. via Matrix).