Skip to content

chore: back-merge main → develop after v0.8.0 promote - #228

Merged
saadqbal merged 3 commits into
developfrom
chore/back-merge-main-to-develop-2026-07-10
Jul 10, 2026
Merged

chore: back-merge main → develop after v0.8.0 promote#228
saadqbal merged 3 commits into
developfrom
chore/back-merge-main-to-develop-2026-07-10

Conversation

@saadqbal

@saadqbalsaadqbal commented Jul 10, 2026

Copy link
Copy Markdown
Collaborator

Back-merge main into develop after the v0.8.0 promote (#219).

main accrues promote merge/snapshot commits (#219, #194, #164) that are never in develop's ancestry, so develop diverges and every future develop→main promote PR eventually goes CONFLICTING. main carries no unique code — only these promote snapshots — so this back-merge is content-only-neutral for develop; it just realigns ancestry so the next promote stays clean.

No code changes vs develop; merging this keeps develop == main content-wise going forward.

🤖 Generated with Claude Code


Note

Low Risk
Merge-only with an empty diff relative to develop; no runtime or security impact.

Overview
No application code changes — this PR only merges main into develop so branch histories match after the v0.8.0 promote.

main had accumulated promote/snapshot merge commits that were not in develop's ancestry, which causes future develop→main promote PRs to conflict. The back-merge realigns ancestry while keeping develop content-equivalent to what it already had; main adds no unique code beyond those promote commits.

Reviewed by Cursor Bugbot for commit b7fbdcc. Bugbot is set up for automated code reviews on this repo. Configure here.

main -> Enhance CI coverage and align CLI success metrics with ingestor
main - > Enhance data ingest with flexible input, schema confirmation, and task updates
@saadqbalsaadqbal self-assigned this Jul 10, 2026
@saadqbal
saadqbal merged commit 06f9d41 into developJul 10, 2026
45 checks passed
@saadqbal
saadqbal deleted the chore/back-merge-main-to-develop-2026-07-10 branch July 10, 2026 16:49
Sign up for freeto 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

@saadqbal@LukasWodka