Builds fine.
But, when I do a git pull I get the following:
Code: Select all
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.
(And if some kind person could explain that "git lingo" (i.e. rebase, ff, etc.) as if to a 5 year old, it would be appreciated. )
(I have the git pocket guide in my left hand...useless. As soon as I hit submit, I'm off to google. )