diff --git a/pkg/analyzer/lib/src/error/codes.g.dart b/pkg/analyzer/lib/src/error/codes.g.dart
index 8ed76794..34789a9 100644
--- a/pkg/analyzer/lib/src/error/codes.g.dart
+++ b/pkg/analyzer/lib/src/error/codes.g.dart
@@ -9475,16 +9475,15 @@
   );
 
   /**
-   * Technically this is [IMPLEMENTS_SUPER_CLASS].
-   * See https://github.com/dart-lang/sdk/issues/25765#issuecomment-307422593
-   *
    * Parameters:
    * 0: the name of the class that appears in both "extends" and "with" clauses
    */
   static const CompileTimeErrorCode MIXINS_SUPER_CLASS = CompileTimeErrorCode(
-    'MIXINS_SUPER_CLASS',
+    'IMPLEMENTS_SUPER_CLASS',
     "'{0}' can't be used in both 'extends' and 'with' clauses.",
     correctionMessage: "Try removing one of the occurrences.",
+    hasPublishedDocs: true,
+    uniqueName: 'MIXINS_SUPER_CLASS',
   );
 
   /**
diff --git a/pkg/analyzer/messages.yaml b/pkg/analyzer/messages.yaml
index 5884bac..f38485c 100644
--- a/pkg/analyzer/messages.yaml
+++ b/pkg/analyzer/messages.yaml
@@ -8297,12 +8297,11 @@
       }
       ```
   MIXINS_SUPER_CLASS:
+    sharedName: IMPLEMENTS_SUPER_CLASS
     problemMessage: "'{0}' can't be used in both 'extends' and 'with' clauses."
     correctionMessage: Try removing one of the occurrences.
+    hasPublishedDocs: true
     comment: |-
-      Technically this is [IMPLEMENTS_SUPER_CLASS].
-      See https://github.com/dart-lang/sdk/issues/25765#issuecomment-307422593
-
       Parameters:
       0: the name of the class that appears in both "extends" and "with" clauses
   MIXIN_APPLICATION_CONCRETE_SUPER_INVOKED_MEMBER_TYPE:
diff --git a/pkg/analyzer/tool/diagnostics/diagnostics.md b/pkg/analyzer/tool/diagnostics/diagnostics.md
index d30bca8..969970e 100644
--- a/pkg/analyzer/tool/diagnostics/diagnostics.md
+++ b/pkg/analyzer/tool/diagnostics/diagnostics.md
@@ -6731,6 +6731,8 @@
 
 ### implements_super_class
 
+_'{0}' can't be used in both 'extends' and 'with' clauses._
+
 _'{0}' can't be used in both the 'extends' and 'implements' clauses._
 
 #### Description
diff --git a/tools/VERSION b/tools/VERSION
index bdada8d..4f0f050 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -27,5 +27,5 @@
 MAJOR 2
 MINOR 18
 PATCH 0
-PRERELEASE 28
+PRERELEASE 29
 PRERELEASE_PATCH 0
\ No newline at end of file