Differences

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

--- developers:git:specificities_git_abinit [2023/05/02 16:38] – [What is an "on-track" branch ?] Xavier Gonze
+++ developers:git:specificities_git_abinit [2024/04/09 16:58] (current) – [How to synchronize with the "trunk" virtual user ?] Xavier Gonze
@@ Line 30: / Line 30: @@
 \\
 After some modifications, using the git commands (e.g. git add, git commit ...), you can push on the gitlab server thanks to : \\
-<color blue>git push </color>\\
-[ or\\
 <color blue>git push --tags  </color>     <color red>( double-dash before tags )</color>\\
-if tags have been introduced...]\\
+\\
 In order for the modifications to be merged in the trunk, a merge request has to be issued, as described later.\\
 \\
@@ Line 76: / Line 74: @@
 As an example, suppose we were on ABINIT v9.9.3, and want to start preparing a release 9.10.1 (for release) and a new v9.11.0 (for development)   :
   * a branch entitled <color magenta>release-9.10</color> will be forked from the <color magenta>develop</color> branch ;
-  * after this branching, the first commit in the <color magenta>release-9.10</color> branch is 1d5efe42, while the first commit in the <color magenta>develop</color> is the commit 34dbe7f2d
+  * after this branching, suppose the first commit in the <color magenta>release-9.10</color> branch is 1d5efe42, while the first commit in the <color magenta>develop</color> is the commit 34dbe7f2d
   * for a <color magenta>develop</color> branch to be considered **on-track** (and eligible for a merge request), the commit 34dbe7f2d must be present ;
   * for a <color magenta>release-9.10</color> branch to be considered **on-track** (and eligible for a merge request), the commit 1d5efe42 must be present, while it will be forbidden to contain the commit 34dbe7f2d .
@@ Line 117: / Line 115: @@
 Then, in order to synchronize, in a first step, issue :
-   git fetch trunk
+   git fetch --tags trunk
 then, if the develop branch is to be updated, supposing it is checked out, merge the trunk/develop in your develop :
@@ Line 123: / Line 121: @@
    git merge remotes/trunk/develop
-You can combine the last two commands in one as:
-   git pull trunk develop
 ===== How to set up a "hotfix" branch to be merged in trunk/release-x.y ? =====
@@ Line 134: / Line 129: @@
    git checkout release-9.8
    git merge remotes/trunk/release-9.8
-   git push -u origin release-9.8
+   git push -u origin release-9.8 --tags
 That's it ! You can now make modifications in your release-9.8, then issue a merge request to the trunk/release-9.8 .