readme update

This commit is contained in:
Robin Müller 2020-10-30 13:14:27 +01:00
parent 81f502f83d
commit 2a63be58fb

View File

@ -104,6 +104,7 @@ into the fork, run the following command in the fsfw folder first:
```sh
git remote add upstream https://egit.irs.uni-stuttgart.de/fsfw/fsfw.git
git remote update --prune
```
After that, an update can be merged by running
@ -113,4 +114,4 @@ git merge upstream/master
```
Alternatively, changes from other upstreams (forks) and branches can be merged like that in
the same way.
the same way.