I was able to overcome this issue with the following Visual Studio 2017 change:
In Team Explorer, go to Settings. Go to Global Settings to configure this option at the global level; go to Repository Settings to configure this option at the repo level.
Set Rebase local branch when pulling to the desired setting (for me it was True), and select Update to save.