Merge requests#

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

Review#

Please only merge merge requests (MR) 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 hickup or a flaky test. In that case retrigger that specific job and if it succeeds reassign to margebot.

Reviewing merge requests#

Please take the time to review other Phosh maintainer’s merge requests. Even if you’re not deeply familiar with the code as it helps to catch stupid 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 got broken by a merged MR or an infra change a minimal patch to unbreak this can be merged right away (but ideally seek a quick review e.g. via matrix).