Differences between revisions 2 and 14 (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:..."
Create corresponding branch xxx-description on DKRZ server
Update local repository
```
git pull
```
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 checkout devel
git pull
git checkout xxx-description
git merge devel

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

-  ⇤ ← Revision 2 as of 2019-11-27 09:50:49 → 
  Size: 1668
  Editor: NicoleThomas
  Comment:
+   ← Revision 14 as of 2024-06-25 07:37:50 → ⇥
  Size: 2058
  Editor: NicoleThomas
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 2:
+see '''CONTRIBUTING.md''' in messy main directory
-Line 15:
+Line 17:
- * Create corresponding branch '''issue_xxx''' on DKRZ server
+ * Create corresponding branch '''xxx-''description''''' on DKRZ server
-Line 24:
+Line 26:
-git checkout issue_xxx
+git checkout xxx-description
-Line 36:
+Line 38:
-   * 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 41:
+Line 43:
+ * Before pushing: <<BR>><<BR>>
 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
}}}
-Line 49:
+Line 63:
+git checkout devel
-Line 50:
+Line 65:
+git checkout xxx-description
-Line 58:
+Line 74:
-    * select source branch (issue_XYZ) and destination branch (devel)
+    * select source branch (XXX-description) and destination branch (devel)
-Line 62:
+Line 78:
-see '''CONTRIBUTING.md''' in messy main directory