= MESSy/CLaMS: Commit Changes to DKRZ server =
* Before the very first commit configure the author name and email address to be used with your commits (saved in ''~/.gitconfig''):
{{{
git config --global user.name "firstname lastname"
git config --global user.email name@fz-juelich.de
}}}
* Create issue on DKRZ server
* '''issue #xxx'''
* Description of issue: "CLaMS:..."
* Create corresponding branch '''issue_xxx''' on DKRZ server
* Update local repository
{{{
git pull
}}}
* Switch to new branch
{{{
git checkout issue_xxx
}}}
=> already modified files are applied to the new branch
* Check your changes and commit:
{{{
git status
git add [...]
git commit
}}}
Commit Message:
* first line with issue number
xxx: ...
(xxx: clams-submodul: ... -> all "clams" commits can be searched on DKRZ server!)
* empty second line
* additional explanatory text with as much details as desired from the third line onwards
* Before pushing: <
><
>
List all files to be pushed:
{{{
git diff --stat --cached origin/devel
git diff --stat --cached origin/issue_xxx
}}}
View all differences in all files to be pushed:
{{{
git diff --cached origin/devel
git diff --cached origin/issue_xxx
}}}
* Push your changes to the new branch on DKRZ server
{{{
git push
}}}
* Update your branch regularly with current devel branch
{{{
git checkout devel
git pull
git checkout issue_xxx
git merge devel
}}}
* Create merge request on DKRZ server
* click on "Merge Requests"
* select "New Merge Request"
* select source branch (issue_XYZ) and destination branch (devel)
* click on "Compare branches and continue"
* enter title (maybe remove "WIP:"), description (name co-referees by @-mentions) and assignee (Patrick Joeckel),
maybe select "delete source branch when merge request is accepted" and sent it
see '''CONTRIBUTING.md''' in messy main directory