Skip to content

chore: bring the reviewed PR chain into main - #20

Open
PSamuele wants to merge 15 commits into
mainfrom
chore/merge-into-main
Open

PSamuele wants to merge 15 commits into
mainfrom
chore/merge-into-main

Conversation

@PSamuele

Copy link
Copy Markdown
Contributor

What

PRs #4 to #16 were merged into their own base branch, not into main, so the work never reached main: it all sits on top of chore/remove-example-results. This PR closes the chain.

It also brings main (PR #15 roadmap and PR #19 README) into the chain, so the merge is clean.

Conflict resolved

One conflict in README.md, in the "Aerodynamics" section: PR #19 added "(uniformally distributed)" to the panel-method description, PR #8 changed the XFOIL line just below. Both changes are kept. "uniformally" is spelled "uniformly".

Also in this commit

The "Roadmap" section is removed from the README: the same items are in TODO.md (#15), and two lists would drift apart. The Limitations section now links to TODO.md.

Verified

Merge reproduced locally: README.md is the only conflict, and on the merged tree python tests/baseline_check.py gives 24/24.

After merging

main will contain everything: naca_core/ with the shared core and the export, tests/, the updated READMEs and TODO.md. The branches of the merged PRs can be deleted.

PSamuele and others added 15 commits September 10, 2026 16:25
feat: export for CAD, ParaView and OpenFOAM
@Filettus-newkeyboard

Copy link
Copy Markdown
Contributor

Per me va bene, vedo solo che dei pezzi di codice nella review sono stati interamente cancellati. Se intendevi toglierli, allora approvo

@PSamuele

Copy link
Copy Markdown
Contributor Author

Sì, sono tutte volute. La #20 non aggiunge cancellazioni sue: raccoglie le PR dalla #4 alla #16, che hai già approvato una per una, e confrontate tutte insieme con il main vecchio sembrano tante.

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