Differences

This shows you the differences between two versions of the page.

--- en:uhsdr_dev:git [13.03.2018 12:45] – github additions 1 df9ts_user
+++ en:uhsdr_dev:git [13.03.2018 12:52] – github changes 2 df9ts_user
@@ Line 13: / Line 13: @@
   * If using Eclipse: create a work space pointing at the local directory where UHSDR has been unpacked. Check Eclipse settings after that (active build etc.)
-==== Option: Use "git" on command line level, Unix style ====
+==== Option: Use "git" on command line level, command line style ====
 === Fork UHSDR to your own remote github repo ===
@@ Line 26: / Line 26: @@
   * Check the remote repos assigned <code>git remote -v</code>
   * Add DF8OE UHSD repo as upstream remote repo so that you can esaly synch it with your fork: <code>git remote add upstream https://github.com/df8oe/UHSDR</code>
-  *
+  * Check with "git remote -v" that upstream has been added. You now have two remote repos: "origin" which is your fork on github, and "upstream" which is the DF8OE master repo
+=== Rebase: Synchronising your fork with UHSDR DF8OE repo ===
+  * You want to synchronise your forked UHSDR with the DF8OE main repo from time to time to include the latest changes of UHSDR into your fork.
+  * For that use <code> git pull --rebase upstream active-devel</code>
+  * Your local fork is now synchronised with UHSDR DF8OE repo
+  * Next you need to push these changes to your remote github repo <code>git push origin active-devel</code>
+  * Your github fork is now synchronised with DF8OE UHSDR main repo