developers:git:specificities_git_abinit
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revisionNext revisionBoth sides next revision | ||
developers:git:specificities_git_abinit [2020/02/28 21:02] – [How and when will the merge in the master branch be done ?] Xavier Gonze | developers:git:specificities_git_abinit [2021/10/05 09:00] – [How to set up a "hotfix" branch to be merged in trunk/release-x.y ?] Xavier Gonze | ||
---|---|---|---|
Line 10: | Line 10: | ||
On the ABINIT gitlab server, an ABINIT project can be defined, specifically for you, with address <color blue> | On the ABINIT gitlab server, an ABINIT project can be defined, specifically for you, with address <color blue> | ||
- | In order to start to work locally (not on the ABINIT gitlab server, but on your own machine), you should setup the SSH environment for gitlab, as described | + | In order to start to work locally (not on the ABINIT gitlab server, but on your own machine), you should setup the SSH environment for gitlab, as described |
You have by default a <color magenta> | You have by default a <color magenta> | ||
Line 127: | Line 127: | ||
git pull trunk develop | git pull trunk develop | ||
- | If, on the contrary, | + | ===== How to set up a " |
- | | + | If you have a hotfix, a new branch |
- | git checkout release-8.8 | + | |
- | git merge remotes/ | + | |
- | git push -u origin release-8.8 | + | |
- | That's it ! You can now make modifications in your release-8.8, then issue a merge request to the trunk/ | + | git branch release-9.6 start-9.6.2 |
+ | git checkout release-9.6 | ||
+ | git merge remotes/ | ||
+ | git push -u origin release-9.6 | ||
+ | |||
+ | That's it ! You can now make modifications in your release-9.6, then issue a merge request to the trunk/ | ||
===== Additional info: how to not mess with your branches ? ... show-branch ... ===== | ===== Additional info: how to not mess with your branches ? ... show-branch ... ===== |
developers/git/specificities_git_abinit.txt · Last modified: 2024/04/09 16:58 by Xavier Gonze