merge: incorporate origin/main history for clean PR merge

Browse Source

Merge origin/main (FreeCAD 1.0.0 + Kindred) into kindred-on-upstream-1.2
(FreeCAD 1.2.0-dev + Kindred) using 'ours' strategy. This makes origin/main
an ancestor of our branch so the PR can merge cleanly.

All Kindred files were already copied in earlier commits. The 'ours' strategy
preserves the upstream 1.2.0-dev codebase with all Kindred patches applied.

...

This commit is contained in:

forbes

2026-02-14 10:31:10 -06:00

parent 8e60dda810 a0219a72e9

commit 3c64298e40

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available