ci: remove changelog generation and auto-resolve version conflicts in sync

- Remove @semantic-release/changelog from .releaserc.cjs (release notes
  live on GitHub releases only, CHANGELOG.md caused merge conflicts)
- Auto-resolve package.json and CHANGELOG.md conflicts in sync workflow
  by keeping main's version (semantic-release manages versions per-branch)

Author: caio-pizzol

.github/workflows/sync-patches.yml

@@ -74,28 +74,64 @@ jobs:
 
             echo "✅ Created sync PR"
           else
-            echo "⚠️ Merge conflict — creating PR with conflict markers for manual resolution."
+            echo "Merge conflict — attempting auto-resolution of release artifacts..."
+
+            # Auto-resolve expected conflicts: package.json version and CHANGELOG.md.
+            # For these files, keep main's version (semantic-release manages them per-branch).
+            for f in packages/superdoc/package.json packages/superdoc/CHANGELOG.md; do
+              if git diff --name-only --diff-filter=U | grep -qF "$f"; then
+                echo "  Auto-resolving $f (keeping main's version)"
+                git checkout --ours "$f"
+                git add "$f"
+              fi
+            done
+
+            # Check if all conflicts are resolved
+            if [ -z "$(git diff --name-only --diff-filter=U)" ]; then
+              git commit --no-edit
+              git push origin "$SYNC_BRANCH"
+
+              gh pr create \
+                --base main \
+                --head "$SYNC_BRANCH" \
+                --title "🔄 Sync stable → main" \
+                --body "$(cat <<'EOF'
+          ## Summary
+          Merges latest stable patches into main to keep branches in sync.
 
-            # Abort the failed merge and try again with conflict markers
-            git merge --abort
-            git merge origin/stable --no-edit --no-commit || true
-            git add -A
-            git commit -m "chore: merge stable into main (conflicts need resolution)"
-            git push origin "$SYNC_BRANCH"
+          Release artifact conflicts (package.json version, CHANGELOG.md) were auto-resolved.
 
-            gh pr create \
-              --base main \
-              --head "$SYNC_BRANCH" \
-              --title "🔄 Sync stable → main (conflicts)" \
-              --body "$(cat <<'EOF'
+          ---
+          _Auto-created by sync-patches workflow._
+          EOF
+                )" \
+                --label "patch-sync"
+
+              echo "✅ Created sync PR (release conflicts auto-resolved)"
+            else
+              echo "⚠️ Unresolved conflicts remain — creating PR for manual resolution."
+
+              # Commit with conflict markers so the PR is reviewable
+              git add -A
+              git commit -m "chore: merge stable into main (conflicts need resolution)"
+              git push origin "$SYNC_BRANCH"
+
+              gh pr create \
+                --base main \
+                --head "$SYNC_BRANCH" \
+                --title "🔄 Sync stable → main (conflicts)" \
+                --body "$(cat <<'EOF'
           ## Summary
           Merges latest stable patches into main. **Has merge conflicts that need manual resolution.**
 
+          Release artifact conflicts were auto-resolved, but other conflicts remain.
+
           ---
           _Auto-created by sync-patches workflow._
           EOF
-              )" \
-              --label "patch-sync"
+                )" \
+                --label "patch-sync"
 
-            echo "⚠️ Created sync PR with conflicts"
+              echo "⚠️ Created sync PR with conflicts"
+            fi
           fi

packages/superdoc/.releaserc.cjs

@@ -76,22 +76,12 @@ const isPrerelease = config.branches.some(
 )
 
 if (!isPrerelease) {
-  // Add changelog BEFORE git
-  config.plugins.push([
-    '@semantic-release/changelog',
-    {
-      changelogFile: 'CHANGELOG.md'
-    }
-  ])
-
-  // Git plugin comes AFTER npm and changelog
+  // Git plugin commits the version bump back to the branch.
+  // No changelog — release notes live on the GitHub release only.
   config.plugins.push([
     '@semantic-release/git',
     {
-      assets: [
-        'CHANGELOG.md',
-        'package.json'
-      ],
+      assets: ['package.json'],
       message:
         'chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}',
     },