CODE EXAMPLE FOR SHELL

hint: Pulling without specifying how to reconcile divergent branches is

which means you will just take what is in master, no harm should be:

git config pull.ff only          # fast-forward only