I guess you had primitive marked as deleted in dataset, that was part of conflict. After upload the primitive got really deleted from the dataset. ConflictResolution dialog needs primitive to be in dataset for getReferrers() to work - you got an exception.
I see to problems here:
- UploadSelection action should warn about conflicts
- when primitives are uploaded despite of conflicts, the conflicts should be removed.
Think these two problems are fixed. Can someone check one devapi or local ?