pulling, fetching, pushing, merging, rebase

[oceanblue42]

A teacher create a template. I created a repo from that template and then a codingspace from that repo. The teacher updated the template. I am unable to pull the updates into coding spaces. I keep getting: From https://github.com/oceanblue42/python_class

• branch master -> FETCH_HEAD
  hint: You have divergent branches and need to specify how to reconcile them.
  hint: You can do so by running one of the following commands sometime before
  hint: your next pull:
  hint:
  hint: git config pull.rebase false # merge
  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.
  fatal: Need to specify how to reconcile divergent branches.

no matter what I do nothing seems to work.

could someone provide step by step instructions, on what to do to be able to pull the updates down from the template?