1
v18e@v17:~/enterprise$ git pull origin master
2
remote: Enumerating objects: 2042, done.
3
remote: Counting objects: 100% (1570/1570), done.
4
remote: Compressing objects: 100% (443/443), done.
5
remote: Total 2042 (delta 1165), reused 1302 (delta 1120), pack-reused 472 (from 1)
6
Receiving objects: 100% (2042/2042), 1.57 MiB | 3.71 MiB/s, done.
7
Resolving deltas: 100% (1231/1231), completed with 777 local objects.
8
From github.com:odoo/enterprise
9
 * branch                    master     -> FETCH_HEAD
10
   4da1319fa3b..5fdc0e30762  master     -> origin/master
11
hint: You have divergent branches and need to specify how to reconcile them.
12
hint: You can do so by running one of the following commands sometime before
13
hint: your next pull:
14
hint: 
15
hint:   git config pull.rebase false  # merge
16
hint:   git config pull.rebase true   # rebase
17
hint:   git config pull.ff only       # fast-forward only
18
hint: 
19
hint: You can replace "git config" with "git config --global" to set a default
20
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
21
hint: or --ff-only on the command line to override the configured default per
22
hint: invocation.
23
fatal: Need to specify how to reconcile divergent branches.