Files listed as pending changes when doing merges that didn't change?

Question

We\'ve had this happen more than a few times were we consider it to be more than a fluke at this point. When we are merging back after we are complete with our branch there

Answer 1

For anyone having the same issue a work around is to undo your pending changes. When you get the confirmation dialog choose "No to all". Only your pending changes should be left.