developers:git:specificities_git_abinit
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
developers:git:specificities_git_abinit [2023/05/02 16:38] – [What is an "on-track" branch ?] Xavier Gonze | developers:git:specificities_git_abinit [2024/04/09 16:58] (current) – [How to synchronize with the "trunk" virtual user ?] Xavier Gonze | ||
---|---|---|---|
Line 30: | Line 30: | ||
\\ | \\ | ||
After some modifications, | After some modifications, | ||
- | <color blue>git push </ | ||
- | [ or\\ | ||
<color blue>git push --tags | <color blue>git push --tags | ||
- | 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 117: | Line 115: | ||
Then, in order to synchronize, | Then, in order to synchronize, | ||
- | git fetch trunk | + | git fetch --tags |
then, if the develop branch is to be updated, supposing it is checked out, merge the trunk/ | then, if the develop branch is to be updated, supposing it is checked out, merge the trunk/ | ||
Line 123: | Line 121: | ||
git merge remotes/ | git merge remotes/ | ||
- | You can combine the last two commands in one as: | ||
- | |||
- | git pull trunk develop | ||
===== How to set up a " | ===== How to set up a " | ||
Line 134: | Line 129: | ||
git checkout release-9.8 | git checkout release-9.8 | ||
git merge remotes/ | git merge remotes/ | ||
- | git push -u origin release-9.8 | + | git push -u origin release-9.8 |
That's it ! You can now make modifications in your release-9.8, | That's it ! You can now make modifications in your release-9.8, |
developers/git/specificities_git_abinit.1683038336.txt.gz · Last modified: 2023/05/02 16:38 by Xavier Gonze