1 개요[ | ]
- Pulling without specifying how to reconcile divergent branches is discouraged.
Console
Copy
root@wsl:/workspace/hello# git pull
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.
Already up to date.
root@wsl:/workspace/hello#
Console
Copy
root@wsl:/workspace/hello# git config --global pull.ff only
root@wsl:/workspace/hello# git pull
Already up to date.
2 같이 보기[ | ]
편집자 Jmnote
로그인하시면 댓글을 쓸 수 있습니다.