Differences

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

--- developers:git:specificities_git_abinit [2020/03/18 17:41] – [Standard names (projects, ID, branches)] Xavier Gonze
+++ developers:git:specificities_git_abinit [2022/07/24 19:02] – [How to set up a "hotfix" branch to be merged in trunk/release-x.y ?] Xavier Gonze
@@ Line 127: / Line 127: @@
    git pull trunk develop
-If, on the contrary, a new branch (e.g. a release branch, let's says 8.8 to fix the ideas) has to be created :
+===== How to set up a "hotfix" branch to be merged in trunk/release-x.y ? =====
-   git branch release-8.8 start-8.8.1    (this creates the branch release-8.8 from the start-8.8.1 tag)
+If you have a hotfix, a new branch has to be created. To fix the ideas, let's suppose you want to communicate a bug fix to ABINITv9.6, you have to issue :
-   git checkout release-8.8
-   git merge remotes/trunk/release-8.8
-   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/release-8.8 .
+   git branch release-9.8 start-9.8.0    (this creates the branch release-9.8 from the start-9.8.0 tag)
+   git checkout release-9.8
+   git merge remotes/trunk/release-9.8
+   git push -u origin release-9.8
+That's it ! You can now make modifications in your release-9.8, then issue a merge request to the trunk/release-9.8 .
 ===== Additional info: how to not mess with your branches ? ... show-branch ... =====