Skip to content

chore: merge main into staging (unblock #200) - #201

Closed
rahul-contentstack wants to merge 10 commits into
stagingfrom
chore/merge-main-into-staging-20261104
Closed

rahul-contentstack wants to merge 10 commits into
stagingfrom
chore/merge-main-into-staging-20261104

Conversation

@rahul-contentstack

Copy link
Copy Markdown
Contributor

Why

#199 was squash-merged, so staging has the same content as main but not main's commit history. Because of that, the release PR #200 (staging → main) shows conflicts in package.json and package-lock.json.

What

Merge main into staging, resolving both conflicts by keeping staging's version (2.4.2).

⚠️ Merge with "Create a merge commit"

Do not squash or rebase this PR. Either would drop main's history again and #200 would still conflict.

🤖 Generated with Claude Code

rahul-contentstack and others added 10 commits June 18, 2026 17:38
Resolve package.json/package-lock.json conflicts by keeping staging (2.4.2).
Brings main's history into staging after the squash merge of #199, so the
staging -> main release PR (#200) merges cleanly.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@snyk-io

snyk-io Bot commented Nov 4, 2026 •

Copy link
Copy Markdown

✅ Snyk checks have passed. No issues have been found so far.

Status Scan Engine Critical High Medium Low Total (0)
✅ Open Source Security 0 0 0 0 0 issues
✅ Licenses 0 0 0 0 0 issues
✅ Code Security 0 0 0 0 0 issues

💻 Catch issues earlier using the plugins for VS Code, JetBrains IDEs, Visual Studio, and Eclipse.

@github-actions

github-actions Bot commented Nov 4, 2026

Copy link
Copy Markdown

🔒 Security Scan Results

ℹ️ Note: Only vulnerabilities with available fixes (upgrades or patches) are counted toward thresholds.

Check Type Count (with fixes) Without fixes Threshold Result
🔴 Critical Severity 0 0 10 ✅ Passed
🟠 High Severity 0 0 25 ✅ Passed
🟡 Medium Severity 0 0 500 ✅ Passed
🔵 Low Severity 0 0 1000 ✅ Passed

⏱️ SLA Breach Summary

✅ No SLA breaches detected. All vulnerabilities are within acceptable time thresholds.

Severity Breaches (with fixes) Breaches (no fixes) SLA Threshold (with/no fixes) Status
🔴 Critical 0 0 15 / 30 days ✅ Passed
🟠 High 0 0 30 / 120 days ✅ Passed
🟡 Medium 0 0 90 / 365 days ✅ Passed
🔵 Low 0 0 180 / 365 days ✅ Passed

✅ BUILD PASSED - All security checks passed

@rahul-contentstack

Copy link
Copy Markdown
Contributor Author

Not needed: merge commits are disabled in this repo. Superseded by #202.

@rahul-contentstack
rahul-contentstack deleted the chore/merge-main-into-staging-20261104 branch November 4, 2026 11:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants