fix conflicts and apply feedback for noDidUpdateSetState

packages/@romejs/diagnostics/categories.ts

@@ -92,8 +92,7 @@ export type DiagnosticCategoryPrefix =
 // EVERYTHING BELOW IS AUTOGENERATED. SEE SCRIPTS FOLDER FOR UPDATE SCRIPTS
 
 type LintDiagnosticCategory =
-<<<<<<< HEAD
-	 | "lint/camelCase"
+	| "lint/camelCase"
 	| "lint/caseSingleStatement"
 	| "lint/confusingLanguage"
 	| "lint/defaultExportSameBasename"
@@ -122,6 +121,7 @@ type LintDiagnosticCategory =
 	| "lint/noDebugger"
 	| "lint/noDelete"
 	| "lint/noDeleteVars"
+	| "lint/noDidUpdateSetState"
 	| "lint/noDupeArgs"
 	| "lint/noDuplicateCase"
 	| "lint/noDuplicateGroupNamesInRegularExpressions"
@@ -156,63 +156,3 @@ type LintDiagnosticCategory =
 	| "lint/unsafeNegation"
 	| "lint/unusedVariables"
 	| "lint/voidDomElementsNoChildren";
-=======
-  | 'lint/camelCase'
-  | 'lint/caseSingleStatement'
-  | 'lint/defaultExportSameBasename'
-  | 'lint/doubleEquals'
-  | 'lint/duplicateImportSource'
-  | 'lint/emptyBlocks'
-  | 'lint/emptyMatches'
-  | 'lint/getterReturn'
-  | 'lint/importDefaultBasename'
-  | 'lint/inconsiderateLanguage'
-  | 'lint/jsxKey'
-  | 'lint/jsxNoCommentText'
-  | 'lint/negationElse'
-  | 'lint/noArguments'
-  | 'lint/noAsyncPromiseExecutor'
-  | 'lint/noCatchAssign'
-  | 'lint/noChildrenProp'
-  | 'lint/noCommaOperator'
-  | 'lint/noCompareNegZero'
-  | 'lint/noCondAssign'
-  | 'lint/noDangerWithChildren'
-  | 'lint/noDebugger'
-  | 'lint/noDelete'
-  | 'lint/noDeleteVars'
-  | 'lint/noDidUpdateSetState'
-  | 'lint/noDupeArgs'
-  | 'lint/noDuplicateCase'
-  | 'lint/noDuplicateGroupNamesInRegularExpressions'
-  | 'lint/noDuplicateKeys'
-  | 'lint/noEmptyCharacterClass'
-  | 'lint/noExplicitAny'
-  | 'lint/noExtraBooleanCast'
-  | 'lint/noFunctionAssign'
-  | 'lint/noImportAssign'
-  | 'lint/noLabelVar'
-  | 'lint/noMultipleSpacesInRegularExpressionLiterals'
-  | 'lint/noPosixInRegularExpression'
-  | 'lint/noReferenceToNonExistingGroup'
-  | 'lint/noSetterReturn'
-  | 'lint/noShadowRestrictedNames'
-  | 'lint/noShorthandArrayType'
-  | 'lint/noTemplateCurlyInString'
-  | 'lint/noUnsafeFinally'
-  | 'lint/noVar'
-  | 'lint/preferBlockStatements'
-  | 'lint/preferFunctionDeclarations'
-  | 'lint/preferTemplate'
-  | 'lint/preferWhile'
-  | 'lint/reactInJsxScope'
-  | 'lint/restrictedGlobals'
-  | 'lint/singleVarDeclarator'
-  | 'lint/sortImportExportSpecifiers'
-  | 'lint/sparseArray'
-  | 'lint/stylePropObject'
-  | 'lint/undeclaredVariables'
-  | 'lint/unsafeNegation'
-  | 'lint/unusedVariables'
-  | 'lint/voidDomElementsNoChildren';
->>>>>>> add rule for no setState in componentDidUpdate and tests