... | ... | @@ -49,6 +49,13 @@ OpenMolcas. In either case, the source branch should be "fast-forwardable" from |
|
|
the current `master`, so make sure your branch is up to date (the best way is
|
|
|
merging `master` into your branch first, and then creating the merge request).
|
|
|
|
|
|
**Important**: Avoid "rebasing" your branch after creating a merge request.
|
|
|
A rebase modifies the affected commits and any reference to the old ones becomes
|
|
|
invalid. It will also be a potential source of confusion and duplicate code for
|
|
|
any developer who fetched the source branch before the rebase. Limit a rebase
|
|
|
to exceptional circumstances and if you see a "Rebase" button on the web
|
|
|
interface, *do not* use it.
|
|
|
|
|
|
After a merge request has been created, it has to be approved and accepted
|
|
|
before the changes are included in the `master` branch. Approvals can be given
|
|
|
by any OpenMolcas developer, with a button click, and a minimum number of
|
... | ... | |