Merge branch 'main' into dev

Browse Source

main holds one commit beyond the initial one, 4fa326d "First implementation
(#1)", the squash merge of pull request 1. Its tree is identical to dev's
0dc0c2b (`git diff 4fa326d 0dc0c2b` is empty), which dev already contains,
so main brings no change dev lacks.

The merge uses the `ours` strategy and keeps dev's tree as it is. A
three-way merge against the only shared base, the initial commit 34c0abb,
would count every file of the squash as added by main, and so bring back
tools/oracle/*.py and tools/*.py, which dev has since moved to
src/paperspec/, without a conflict to show it.

With main as a parent, the pull request from dev to main merges cleanly.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>

...

This commit is contained in:

alexmandClaude committed 2026-10-15 09:49:46 -04:00

2 parents fd4b21eeca 4fa326dc76

commit ad65fcc014

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