Documentation regarding git pull

[edegraaff]

Seems the git pull as mentioned in the wiki demands another approach.
root@horusdemodlib:/home/pi/horusdemodlib# git pull
hint: Pulling without specifying how to reconcile divergent branches is
hint: discouraged. You can squelch this message by running one of the following
hint: commands sometime before your next pull:
hint:
hint: git config pull.rebase false # merge (the default strategy)
hint: git config pull.rebase true # rebase
hint: git config pull.ff only # fast-forward only
hint:
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
Updating 45049be..67f817e
error: Your local changes to the following files would be overwritten by merge:
payload_id_list.txt
Please commit your changes or stash them before you merge.
Aborting
root@horusdemodlib:/home/pi/horusdemodlib#