51,282 views
36 votes
36 votes
Your configuration specifies to merge with the ref.

User Richard DiSalvo
by
3.0k points

1 Answer

14 votes
14 votes

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.

User Tim Boudreau
by
2.2k points