Skip to content

Backmerge to develop #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
rozyczko merged 6 commits into from
Jun 19, 2025
Merged

Backmerge to develop #246

rozyczko merged 6 commits into from
Jun 19, 2025

Conversation

@rozyczko
Copy link
Member

@rozyczko rozyczko commented Jun 19, 2025

After hotfixes, the two branches diverged.

damskii9992 and others added 5 commits April 15, 2025 12:04
@damskii9992
Hotfix release for new documentation
3a41743
@damskii9992
Merge pull request #219 from easyscience/develop
4cb64e6
@rozyczko
Fix for the TXT file reader (#238) (#239)
92ab3d7 
* Fix for the TXT file reader (#238)

* bump version

* added test

* make the file reader more robust for weird/malformed files

* modified the CHANGELOG
@rozyczko
Release 1.1.2
518de11 
* Added chi^2  value and success flag to fit results

* Set bumps version dependency to the working 1.0.0b7 (refl1d and EasyScience)
@rozyczko
Release 1.3.3
c24af81 
proper version number and updated changelog (#245)
github-actions[bot]
github-actions bot requested changes Jun 19, 2025
View reviewed changes
Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This pull request does not contain a valid label. Please add one of the following labels: ['chore', 'fix', 'bugfix', 'bug', 'enhancement', 'feature', 'dependencies', 'documentation']

@rozyczko rozyczko added chore Chore changes to the code [scope] maintenance Code/tooling cleanup, no feature or bugfix (major.minor.PATCH) [priority] medium Normal/default priority labels Jun 19, 2025
@rozyczko rozyczko merged commit 51145c4 into develop Jun 19, 2025
28 checks passed
@rozyczko rozyczko deleted the backmerge_resolved branch June 19, 2025 08:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@github-actions github-actions[bot] github-actions[bot] approved these changes

Assignees

No one assigned

Labels

chore Chore changes to the code [priority] medium Normal/default priority [scope] maintenance Code/tooling cleanup, no feature or bugfix (major.minor.PATCH)

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@rozyczko @damskii9992