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
developers:git:specificities_git_abinit [2024/02/29 10:07] – [(Quick start) Cloning from gitlab] Xavier Gonzedevelopers:git:specificities_git_abinit [2024/04/09 16:58] (current) – [How to synchronize with the "trunk" virtual user ?] Xavier Gonze
Line 121: Line 121:
    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.txt · Last modified: 2024/04/09 16:58 by Xavier Gonze