Skip to content

chore: repair develop ancestry before v0.5.0 release - #28

Merged
suneelprojects merged 2 commits into
developfrom
chore/sync-main-into-develop-v0.5.0
Aug 4, 2026
Merged

suneelprojects merged 2 commits into
developfrom
chore/sync-main-into-develop-v0.5.0

Conversation

@suneelprojects

Copy link
Copy Markdown
Owner

Purpose

Repair develop history after PR #27 was squash-merged, preserving the code but discarding the intended two-parent ancestry.

This PR reuses the already verified two-parent commit 66ca04c05a9610fe5ea716853a7268feb1b49fe2.

Zero-code verification

  • Current develop: cffa0d3e9e461cb502f81c406a365dadc77d96d1
  • Repair head: 66ca04c05a9610fe5ea716853a7268feb1b49fe2
  • Shared tree: 06a5b3e3b969c581d9aa3f25b9f378f1001f1872
  • Direct tree diff between develop and the repair head: 0 files
  • Repair commit parents:
    • 6ac5c7dda47d63c996b01bf7d22981433c136e8b — v0.5.0 develop
    • 5990735edd1dc7958f7ebb92e26f3b0223be499a — v0.4.0 main
  • main is already an ancestor of the repair head.
  • main is not yet an ancestor of current develop.

No source, test, documentation, version, or package file is changed by this repair.

Required merge strategy

Merge this PR using Create a merge commit only.

Do not use Squash and merge or Rebase and merge, because either would again discard the ancestry repair.

After merging, verify:

git fetch origin --prune
git merge-base --is-ancestor origin/main origin/develop

The command must exit successfully. Do not create the final developmain release PR until that verification passes.

suneelprojects and others added 2 commits August 1, 2026 23:22
* feat: add deterministic Agentic EDA notebook export (#21)

* fix: support pandas 3 datetime resolution in notebook export (#23)

* feat: add human approval checkpoints for Agentic EDA (#22)

* feat: add human approval checkpoints for Agentic EDA

* fix: harden Agentic EDA approval validation

* chore: prepare v0.4.0 release (#24)
@suneelprojects
suneelprojects marked this pull request as ready for review August 4, 2026 12:45
@suneelprojects
suneelprojects merged commit b634eb7 into develop Aug 4, 2026
10 checks passed
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.

1 participant