Skip to content

Maintainers corner

Tomas Torsvik edited this page Jun 19, 2020 · 5 revisions

Welcome to BLOM maintainers' corner

Some guidelines for maintainers of the BLOM repository.

How to handle issues

How to handle pull requests

There are three merge methods in gitHub: "merge", "squash and merge", and "rebase and merge". There are pros and cons to each merging strategy, so which one should we use?

  • If a pull request is connected to a single issue, e.g. a bug fix, and there is not a compelling reason to maintain the history of how the issue is resolved, a "squash and merge" has some advantages.
  • In a feature branch development we would probably want to keep the history, so a standard "merge" should be a better option.
  • If the downstream fork is rebased by pull request submitter, the "merge" and "rebase and merge" should be equivalent. Perhaps we should avoid "rebase and merge", but encourage people to rebase their forks if possible?

When should new feature branches be included in the central repository?

Procedure for tags and code releases