-
Notifications
You must be signed in to change notification settings - Fork 25
Maintainers corner
Tomas Torsvik edited this page Jun 19, 2020
·
5 revisions
Some guidelines for maintainers of the BLOM repository.
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?
BLOM wiki, © Copyright 2023, BLOM development team. This documentation is licensed under a ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/.