... | ... | @@ -71,7 +71,15 @@ Make the required modifications. New files have to be added using the command: |
|
|
git add <file(s)>
|
|
|
```
|
|
|
|
|
|
to commit the changes to the local repository
|
|
|
Automated formatting can then be applied using the command:
|
|
|
```bash
|
|
|
git clang-format
|
|
|
```
|
|
|
Note that this requires clang-format to be installed on your system. A list of
|
|
|
modified files (if any) is printed. If files are modified, the git add command
|
|
|
should be run again.
|
|
|
|
|
|
Commit the changes to the local repository with:
|
|
|
|
|
|
```bash
|
|
|
git commit -a
|
... | ... | @@ -100,3 +108,14 @@ Select "Compare branches and continue" |
|
|
Fill in notes for the software coordinators and submit the merge request.
|
|
|
|
|
|
Keep all other settings as defaults.
|
|
|
|
|
|
6. Modifying a merge request
|
|
|
----------------------------
|
|
|
|
|
|
There may be one or more issues with a merge request resulting in SW coordinators
|
|
|
denying the request and indicating in a comment what needs to be fixed.
|
|
|
|
|
|
A merge request may be updated as follows. First, make sure to be in the correct branch.
|
|
|
Then make the necessary corrections and repeat the git add/commit/push commands described
|
|
|
in section 4. The merge request is then automatically updated when the push command is
|
|
|
applied. |
|
|
\ No newline at end of file |