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

Try this:

1. select all pending files
2. on context menu click 'Undo...'
3. in the 'Undo Pending Changes' dialog sort files by 'Change' column
4. deselect all files except 'merge' using shift+click
5. click button 'Undo Changes'