eive/eive-obsw
eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 120 Wiki Activity

readme update

Browse Source
This commit is contained in:
Robin Müller 2020-10-30 13:14:27 +01:00
parent 81f502f83d
commit 2a63be58fb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -104,6 +104,7 @@ into the fork, run the following command in the fsfw folder first:
```sh ```sh
git remote add upstream https://egit.irs.uni-stuttgart.de/fsfw/fsfw.git 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 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 Alternatively, changes from other upstreams (forks) and branches can be merged like that in
the same way. the same way.