Differences between revisions 8 and 20 (spanning 12 versions)

MESSy/CLaMS: Commit Changes to DKRZ server

see CONTRIBUTING.md in messy main directory

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:..."
  (This makes it easy to search for all clams-specific changes)
Create corresponding branch xxx-description on DKRZ server
Update local repository
```
git pull
```
For further information see Update MESSy/CLaMS
Switch to new branch
```
git checkout xxx-description
```
=> 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/xxx-description

View all differences in all files to be pushed:

git diff --cached origin/devel
git diff --cached origin/xxx-description

Push your changes to the new branch on DKRZ server
```
git push
```
Update your branch regularly with current devel branch
```
git fetch origin devel
git merge origin/devel
```
For further information see Update MESSy/CLaMS
Create merge request on DKRZ server
- click on "Merge Requests"
- select "New Merge Request"
- select source branch (XXX-description) 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
Before creating a merge request please check that the code is compiling and running with Basemodel CLaMS and with coupled CLaMS-EMAC run.

-  ⇤ ← Revision 8 as of 2022-09-28 07:27:32 → 
  Size: 2000
  Editor: NicoleThomas
  Comment:
+   ← Revision 20 as of 2025-01-09 11:41:33 → ⇥
  Size: 2405
  Editor: NicoleThomas
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 2:
+see '''CONTRIBUTING.md''' in messy main directory
-Line 13:
+Line 15:
-   * Description of issue: "CLaMS:..."
+   * Description of issue: "CLaMS:..." <<BR>>
   (This makes it easy to search for all clams-specific changes)
-Line 15:
+Line 18:
- * Create corresponding branch '''issue_xxx''' on DKRZ server
+ * Create corresponding branch '''xxx-''description''''' on DKRZ server
-Line 22:
+Line 25:
+ For further information see [[ messy/Update | Update MESSy/CLaMS ]]
-Line 24:
+Line 29:
-git checkout issue_xxx
+git checkout xxx-description
-Line 36:
+Line 41:
-   * first line with issue number
     xxx: ...
    (xxx: clams-submodul: ... -> all "clams" commits can be searched on DKRZ server!)
+   * '''first line with issue number'''
     '''xxx''': ...
    ('''xxx: clams-submodul''': ... -> all "clams" commits can be searched on DKRZ server!)
-Line 46:
+Line 51:
-git diff --stat --cached origin/issue_xxx
+git diff --stat --cached origin/xxx-description
-Line 51:
+Line 56:
-git diff --cached origin/issue_xxx
+git diff --cached origin/xxx-description
-Line 61:
+Line 66:
-git checkout devel
git pull
git checkout issue_xxx
git merge devel
+git fetch origin devel
git merge origin/devel
-Line 67:
+Line 70:
+ For further information see [[ messy/Update | Update MESSy/CLaMS ]]
-Line 72:
+Line 76:
-    * select source branch (issue_XYZ) and destination branch (devel)
+    * select source branch (XXX-description) and destination branch (devel)
-Line 75:
+Line 79:
-      maybe select "delete source branch when merge request is accepted"  and sent it
+      maybe select "delete source branch when merge request is accepted"  and sent it<<BR>> <<BR>>
-Line 77:
+Line 81:
-see '''CONTRIBUTING.md''' in messy main directory
+ '''Before creating a merge request please check that the code is compiling and running with Basemodel CLaMS and with coupled CLaMS-EMAC run.'''