Browse Source

Fix errors in the exercise that occured during the presentation

Manuel Vögele 8 years ago
parent
commit
8c7158a7f9
1 changed files with 2 additions and 2 deletions
  1. 2
    2
      hw0/gittask0/README.md

+ 2
- 2
hw0/gittask0/README.md View File

51
 * Erstelle einen Pull-Request von _hw0-UserB_ auf _hw0_.
51
 * Erstelle einen Pull-Request von _hw0-UserB_ auf _hw0_.
52
   **Konflikt tritt auf!**
52
   **Konflikt tritt auf!**
53
 
53
 
54
-### User A @ Container
54
+### User B @ Container
55
 ```bash
55
 ```bash
56
 git checkout hw0
56
 git checkout hw0
57
 git pull
57
 git pull
58
 git checkout hw0-UserB
58
 git checkout hw0-UserB
59
-git merge hw0-UserA
59
+git merge hw0
60
 # edit SOLUTIONS.md
60
 # edit SOLUTIONS.md
61
 git commit -v SOLUTIONS.md
61
 git commit -v SOLUTIONS.md
62
 git push
62
 git push

Loading…
Cancel
Save