Update 'README.md'

This commit is contained in:
Robin Müller 2020-10-30 13:12:17 +01:00 committed by Robin Müller
parent 106b274b60
commit 0b76f82a9c

View File

@ -96,3 +96,21 @@ a permanent solution). If running the script before executing the binary does
not help or an warning is issue that the soft real time value is invalid, not help or an warning is issue that the soft real time value is invalid,
the hard real-time limit of the system might not be high enough (see step 1). the hard real-time limit of the system might not be high enough (see step 1).
### Flight Software Framework (FSFW)
An EIVE fork of the FSFW is submodules into this repository.
To add the master upstream branch and merge changes and updates from it
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
```
After that, an update can be merged by running
```sh
git merge upstream/master
```
Alternatively, changes from other upstreams (forks) and branches can be merged like that in
the same way.