I have been unable to merge changed files from a Source to a Destination. I select the Source project and Merge. I then select the Destination and tell it to use a specific changeset.

The changed file then appears in the Pending Changes tab. I select the file and Check In. A resolve files dialog then appears. There are two options: Undo local changes and Igrnore Conflict.

If I select Undo local changes the file disappears from Pending Changes but never is actually merged and does not appear in the History.

If I select Ignore Conflict the file still appears in Pending Changes and nothing ever happens.

Is this a bug and, if so, how do I work around it?