When I do a git pull, I'm getting a
Your configuration specifies to merge with the ref 'refs/heads/Feature/MyFeatureBranch' from the remote, but no such ref was fetched.
My .git/config looks like:
[core]
bare = false
repositoryformatversion = 0
filemode = false
symlinks = false
ignorecase = true
logallrefupdates = true
[remote "origin"]
url = https://mycompanysgitserver
fetch = +refs/heads/*:refs/remotes/origin/*
[branch "0019"]
remote = origin
merge = refs/heads/0019
[branch "develop"]
remote = origin
merge = refs/heads/develop
[branch "Feature/MyFeatureBranch"]
remote = origin
merge = refs/heads/Feature/MyFeatureBranch
If I do a git status I see:
On branch Feature/MyFeatureBranch Your branch is behind 'origin/Feature/MyFeatureBranch' by 3 commits, and can be fast-forwarded. (use "git pull" to update your local branch) nothing to commit, working directory clean
git ls-remote shows me:
a5389a71eea0f30dfa96cfc95f4c19bb57a5d1a6 refs/heads/feature/MyFeatureBranch
I've searched around including the suggestions here and it doesn't seem that I have any of the common problems that result in this error message.
Thanks,