Differences

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

--- developers:git:specificities_git_abinit [2024/02/29 09:06] – [How to synchronize with the "trunk" virtual user ?] Xavier Gonze
+++ developers:git:specificities_git_abinit [2024/09/02 14:20] (current) – Maryam Azizi
@@ Line 1: / Line 1: @@
+<WRAP important>**IMPORTANT WARNING**\\ **<color #ed1c24>This Page is obsolete.</color>** Please refer to www.abinit.org!</WRAP>
 ====== git(lab) : ABINIT specificities ======
@@ Line 30: / Line 32: @@
 \\
 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 123: / Line 123: @@
    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 131: @@
    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 .