From 0b76f82a9c37f2b54486f32d01fbb912bf0f0976 Mon Sep 17 00:00:00 2001
From: Robin Mueller <muellerr@irs.uni-stuttgart.de>
Date: Fri, 30 Oct 2020 13:12:17 +0100
Subject: [PATCH] Update 'README.md'

---
 README.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/README.md b/README.md
index 8a361e7b..c2ed20ec 100644
--- a/README.md
+++ b/README.md
@@ -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, 
 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.
\ No newline at end of file