Question

Your configuration specifies to merge with the ref.

Answer 1

Step-by-step explanation:

In my case, my local branch and remote branch had different capitalization.

To resolve this I deleted my local branch $ git branch -d branch-name, then checked out the remote branch again using $ git fetch and $ git checkout Branch-name.