Differences between revisions 11 and 14 (spanning 3 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

Update your branch regularly with current devel branch

git checkout devel
git pull
git checkout xxx-description
git merge devel

-  ⇤ ← Revision 11 as of 2024-06-25 07:30:53 → 
  Size: 2034
  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 46:
+Line 48:
-git diff --stat --cached origin/issue_xxx
+git diff --stat --cached origin/xxx-description
-Line 51:
+Line 53:
-git diff --cached origin/issue_xxx
+git diff --cached origin/xxx-description
-Line 63:
+Line 65:
-git checkout issue_xxx
+git checkout xxx-description
-Line 72:
+Line 74:
-    * select source branch (issue_XYZ) and destination branch (devel)
+    * select source branch (XXX-description) and destination branch (devel)
-Line 76:
+Line 78:
-see '''CONTRIBUTING.md''' in messy main directory