Skip to content
Snippets Groups Projects
Commit ffdc1e46 authored by Tobias Fiebig's avatar Tobias Fiebig
Browse files

updated merge instructions

parent 4175c15c
Branches master
No related tags found
No related merge requests found
......@@ -55,7 +55,13 @@ git merge upstream-2.9.0
Update the branch adding streaming:
```
git checkout tud streaming
git checkout streaming
git merge upstream-2.9.0
```
Update the branch removing avartars:
```
git checkout disable_avatar
git merge upstream-2.9.0
```
......@@ -67,6 +73,7 @@ git merge rec_restrictions
git merge openid-changes
git merge tud_visual
git merge streaming
git merge disable_avatar
```
Push the new custom branch to github
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment