1、git pull 时如👇图警告

    1. hint: Pulling without specifying how to reconcile divergent branches is
    2. hint: discouraged. You can squelch this message by running one of the following
    3. hint: commands sometime before your next pull:
    4. hint: 
    5. hint:   git config pull.rebase false  # merge (the default strategy)
    6. hint:   git config pull.rebase true   # rebase
    7. hint:   git config pull.ff only       # fast-forward only
    8. hint: 
    9. hint: You can replace "git config" with "git config --global" to set a default
    10. hint: preference for all repositories. You can also pass --rebase, --no-rebase,
    11. hint: or --ff-only on the command line to override the configured default per
    12. hint: invocation.
    13. Already up to date.

    解决办法：

    1. git config pull.rebase false