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/03/18 17:41] – [Standard names (projects, ID, branches)] Xavier Gonze | developers:git:specificities_git_abinit [2023/05/02 16:38] – [What is an "on-track" branch ?] Xavier Gonze | ||
---|---|---|---|
Line 74: | Line 74: | ||
For a <color magenta> | For a <color magenta> | ||
- | As an example, suppose we were on ABINIT v9.0.0, and want to start preparing a release 9.0.1 (for release) and a new v9.1.0 (for development) | + | As an example, suppose we were on ABINIT v9.9.3, and want to start preparing a release 9.10.1 (for release) and a new v9.11.0 (for development) |
- | * a branch entitled <color magenta> | + | * a branch entitled <color magenta> |
- | * after this branching, the first commit in the <color magenta> | + | * after this branching, the first commit in the <color magenta> |
- | * for a <color magenta> | + | * for a <color magenta> |
- | * for a <color magenta> | + | * for a <color magenta> |
- | In complement to the start of a X.Y.Z version being tagged as " | + | In complement to the start of a X.Y.Z version |
- | the commit that ends some X.Y.Z version | + | the commit that ends some X.Y.Z version |
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.8 start-9.8.0 |
+ | git checkout release-9.8 | ||
+ | git merge remotes/ | ||
+ | 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/ | ||
===== 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