ADS-B Receiver Project Setup Scripts

[mgunther]

@dschaper

A git pull is just basically a get fetch followed by a git merge. It’s just one command to do both steps. When Joe has the git fetch command it pulls down the new code and then rebase with the hard command nukes any changes that are in the local repo and resets HEAD to point to the new HEAD that the git fetch grabbed. So he’s doing a code pull and then a hard rebase/reset. Next is just a branch checkout to get the updated branch as the local source and from there is just a regular install using the scripts.

So he’s already doing a git pull just in multiple steps. I almost never do a pull but go for the two step approach since sometimes I don’t want the code to auto merge, I want to do that step myself.

OK, but this is what I get:

pi@raspberrypi:~ $ cd adsb-feeder/
pi@raspberrypi:~/adsb-feeder $ git fetch --all
Fetching origin
pi@raspberrypi:~/adsb-feeder $ git reset --hard origin/master
HEAD is now at 5fd4b70 Uncommented wlan0 interface.
pi@raspberrypi:~/adsb-feeder $ git checkout admin
Already on 'admin'
Your branch is behind 'origin/admin' by 48 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
pi@raspberrypi:~/adsb-feeder $

It tells me to update my local branch by using “git pull”.