Skip to content
Snippets Groups Projects
Commit 6a9dd2bd authored by Danny Michael Drieß's avatar Danny Michael Drieß
Browse files

Update README.md

parent fa186435
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 1 deletion
00/README.md
+ 2
− 1
View file @ 6a9dd2bd
...@@ -21,6 +21,7 @@ If you are using the TU gitlab, please add the following accounts: ...@@ -21,6 +21,7 @@ If you are using the TU gitlab, please add the following accounts:
- ischubert - ischubert
- driessdy - driessdy
- levit - levit
The role should be at least `Reporter` for these accounts. The role should be at least `Reporter` for these accounts.
## Ex. 0.4 Tell us where your repo is located ## Ex. 0.4 Tell us where your repo is located
...@@ -86,4 +87,4 @@ git merge upstream/main origin/main ...@@ -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`). `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). 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
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