Skip to content

Sync dev and main - #236

Merged
andybeet merged 70 commits into
mainfrom
dev
Jul 31, 2026
Merged

Sync dev and main#236
andybeet merged 70 commits into
mainfrom
dev

Conversation

@BBeltz1

@BBeltz1 BBeltz1 commented Jul 30, 2026

Copy link
Copy Markdown
Collaborator

PRs into dev contained all necessary info. They have already been approved.
Please provide the information below so main can be synced with dev:

List PRs

List the PRs that were merged into dev that will be pulled into main and any issues they fix:

Types of changes

What types of changes does this pull request introduce? Put an x in the boxes that apply.
This will inform the new release number.

  • Fix (non-breaking change which fixes a bug)
  • Feature (non-breaking change which adds or changes functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Other change (if none of the other choices apply)

If any checkboxes other than "Other change" have been selected, include the following file changes for a new release version:

  • changelog.rmd - add release notes
  • DESCRIPTION - increment the version number according to Semantic Versioning

Reviewer instructions

The underlying PRs should have been reviewed. Please check that the proposed merge is correct before approving as well as the DESCRIPTION and changelog.rmd files for correctness.

BBeltz1 and others added 30 commits July 23, 2026 12:24
Refactor!(#222): Change default branch from `master` to `main`
Build(#229): Redefine workflow triggers and bump action versions
@BBeltz1
BBeltz1 marked this pull request as ready for review July 30, 2026 17:22
@BBeltz1
BBeltz1 requested a review from andybeet July 30, 2026 17:56

@andybeet andybeet left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Since catalog.Rproj was deleted i had to copy from main and add it to open the project. However .gitignore is not ignoring it. May need to add *.Rroj to .gitignore file

@BBeltz1
BBeltz1 requested a review from andybeet July 31, 2026 13:40
@BBeltz1

BBeltz1 commented Jul 31, 2026

Copy link
Copy Markdown
Collaborator Author

the .gitignore has been revised to use the suggested syntax

@andybeet andybeet left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

love it!

@andybeet
andybeet merged commit cb76d15 into main Jul 31, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment