developers:git:specificities_git_abinit
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionNext revisionBoth sides next revision | ||
developers:git:specificities_git_abinit [2019/11/05 00:57] – [Additional info: Setup of the SSH environment] Matteo Giantomassi | developers:git:specificities_git_abinit [2020/02/28 21:02] – [How and when will the merge in the master branch be done ?] Xavier Gonze | ||
---|---|---|---|
Line 74: | Line 74: | ||
For a <color magenta> | For a <color magenta> | ||
- | As an example, suppose we were on ABINIT | + | As an example, suppose we were on ABINIT |
- | * a branch entitled <color magenta> | + | * a branch entitled <color magenta> |
- | * after this branching, the first commit in the <color magenta> | + | * after this branching, the first commit in the <color magenta> |
- | * for a <color magenta> | + | * for a <color magenta> |
- | * for a <color magenta> | + | * for a <color magenta> |
In complement to the start of a X.Y.Z version being tagged as " | In complement to the start of a X.Y.Z version being tagged as " | ||
Line 95: | Line 95: | ||
The default selection of bots, that is the " | The default selection of bots, that is the " | ||
The selection capabilities of the Buildbot Status table are rather extended, you have to play a bit wit them. | The selection capabilities of the Buildbot Status table are rather extended, you have to play a bit wit them. | ||
- | |||
- | (By the way, the behaviour of this Buildbot Status table when changing the selections has still some problems -as of May 2018-. Do not hesitate to click on the update button, and the " | ||
===== How and when will the merge in the master branch be done ? ===== | ===== How and when will the merge in the master branch be done ? ===== | ||
Line 105: | Line 103: | ||
However, when a <color magenta> | However, when a <color magenta> | ||
+ | |||
The master branch is only used by the trunk. So, never issue a merge request to trunk/ | The master branch is only used by the trunk. So, never issue a merge request to trunk/ | ||
developers/git/specificities_git_abinit.txt · Last modified: 2024/04/09 16:58 by Xavier Gonze