Skip to content

chore: reconcile release-closeout main ancestry into dev - #537

Open
daniele21 wants to merge 5 commits into
devfrom
chore/reconcile-release-closeout-main-dev
Open

chore: reconcile release-closeout main ancestry into dev#537
daniele21 wants to merge 5 commits into
devfrom
chore/reconcile-release-closeout-main-dev

Conversation

@daniele21

Copy link
Copy Markdown
Owner

Record the stable main closeout merge as ancestry on top of the current dev tree without changing any files. The merge commit keeps the exact dev@06055aa9... tree, including the newer Local Inference Activity/Audit documentation, and adds main@f396733d... as the second parent. This replaces conflicted PR #536 and preserves both branch histories without overwriting concurrent dev work.

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