Better conflict resolution for cross site copy/paste

Rather than simply renaming a class with a conflict, allow the merging of classes by showing what the conflict is, and allow us to keep/discard all/some conflicting attributes in a class.

  • Tim Mac
  • Apr 26 2018
  • Reviewed