readme update
This commit is contained in:
parent
81f502f83d
commit
2a63be58fb
@ -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.
|
||||
|
Loading…
x
Reference in New Issue
Block a user