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. From github.com:liballeg/allegro5 * branch master -> FETCH_HEAD 4507271f7..570e06cb2 master -> origin/master Updating 4507271f7..570e06cb2 Fast-forward CMakeLists.txt | 2 +- docs/Refman.cmake | 2 +- docs/src/changes-5.2.txt | 164 +++++++++++++++++++++++++++++++++++++++++++++++ include/allegro5/base.h | 8 +-- 4 files changed, 170 insertions(+), 6 deletions(-)