Commit 6a9dd2bd authored by driessdy's avatar driessdy
Browse files

Update README.md

parent fa186435
......@@ -21,6 +21,7 @@ If you are using the TU gitlab, please add the following accounts:
- ischubert
- driessdy
- levit
The role should be at least `Reporter` for these accounts.
## Ex. 0.4 Tell us where your repo is located
......@@ -86,4 +87,4 @@ git merge upstream/main origin/main
```
`fetch` checks for new commits found at the upstream url, and `merge` merges the upstream branch (called `upstream/main`) with your branch (called `origin/main`).
If you only committed changes in `solution_00.py`, you will be able to merge without conflicts (fast-forward).
\ No newline at end of file
If you only committed changes in `solution_00.py`, you will be able to merge without conflicts (fast-forward).
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment