Al escribir el comando $ git pull servidorlocal master me aparece el siguiente warning: hint: You have divergent branches and need to specify how to reconcile them.
benito@benito-2522k3u:~/Ana$ cd proyecto
benito@benito-2522k3u:~/Ana/proyecto$ git pull servidorlocal master
remote: Enumerating objects: 5, done.
remote: Counting objects: 100% (5/5), done.
remote: Compressing objects: 100% (3/3), done.
remote: Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
Unpacking objects: 100% (3/3), 335 bytes | 335.00 KiB/s, done.
From /home/benito/servidor
* branch master -> FETCH_HEAD
d77b9ca..a2394f5 master -> servidorlocal/master
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.