LordWilmore

Arriving a little late to this party, but me and my team have been having this issue since about mid-February, and were having to shelve pending changes, create a branch, then apply shelf and merge, which was obviously sub-optimal. Today we have found that if we use the Merge To option rather than the Merge From option then it works. Might be worth a try if you're hitting this same issue.