Comment by iceman_w

In the following scenario:

origin: A-B-C local: A-B-D

What is the recommended action? git pull --ff-only will fail, right? So should I be using git pull --rebase?