User Tools

Site Tools


developers:git:specificities_git_abinit

Differences

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

Link to this comparison view

Both sides previous revisionPrevious revision
Next revision
Previous revision
developers:git:specificities_git_abinit [2024/02/29 09:06] – [How to set up a "hotfix" branch to be merged in trunk/release-x.y ?] Xavier Gonzedevelopers: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 ====== ====== 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 : \\ 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>\\ <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.\\ 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    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 ? ===== ===== How to set up a "hotfix" branch to be merged in trunk/release-x.y ? =====
developers/git/specificities_git_abinit.1709197589.txt.gz · Last modified: 2024/02/29 09:06 by Xavier Gonze