Differences

This shows you the differences between two versions of the page.

--- developers:git:specificities_git_abinit [2018/05/03 22:30] – [Additional info: how to not mess with your branches ? ... show-branch ...] Xavier Gonze
+++ developers:git:specificities_git_abinit [2018/11/05 18:18] – [git(lab) : ABINIT specifics] Xavier Gonze
@@ Line 1: / Line 1: @@
-====== git(lab) : ABINIT specifics ======
+====== git(lab) : ABINIT specificities ======
 ===== Standard names (projects, ID, branches) =====
@@ Line 105: / Line 105: @@
 However, when a <color magenta>release-*</color> branch is ready to be merged, the "merge request" should target the corresponding <color red>trunk</color>/<color magenta>release-*</color> branch.
-The master branch is only used by the trunk.
+The master branch is only used by the trunk. So, never issue a merge request to trunk/master.
 You are supposed to merge, inside your branches, specific tagged branches from the <color red>trunk</color> user, in order to avoid divergences. These specific tagged branches will be advertised. As [[developers:git:specificities_git_abinit#what_is_an_on-track_branch|mentioned earlier]], the presence of such tagged commits allows one to identify whether the branch is **on-track**, before an automatic testing to be done.