Skip to content

Sync up development with main#478

Merged
allyhawkins merged 91 commits intodevelopmentfrom
allyhawkins/sync-main-manuscript
Jan 6, 2026
Merged

Sync up development with main#478
allyhawkins merged 91 commits intodevelopmentfrom
allyhawkins/sync-main-manuscript

Conversation

@allyhawkins
Copy link
Member

Closes #475

To prepare for the release, I'm syncing up all the new changes in main with the development branch. I resolved some small conflicts when doing this but nothing major. It was mostly just making sure new additions in main and development were both present. Once this goes in, I'll do the changelog and then file the PR from development to main.

allyhawkins and others added 30 commits July 25, 2025 13:37
Changelog entry about merged objects bug fix
allyhawkins and others added 19 commits November 12, 2025 11:52
…ug-docs

Update docs for inferCNV metadata fields
…us-methods

Rewording consensus methods to match paper
Co-authored-by: Stephanie Spielman <[email protected]>
…hangelog

Changelog for new feature additions
Adding suggestions about doublets to the-manuscript branch
Copy link
Member

@sjspielman sjspielman left a comment

Choose a reason for hiding this comment

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

I did a careful read-through here and caught a couple spots from main that need to be fixed. I think it would be fine to accept these suggestions here, and when we merge back into main for the cart release we'll catch them again as little conflicts and sync it all up then. Let me know if you prefer a different route though!

Co-authored-by: Stephanie Spielman <[email protected]>
@allyhawkins
Copy link
Member Author

I accepted your suggestions and I think it should be okay to make the changes here and directly merge development into main, but we'll see.

@allyhawkins allyhawkins requested a review from sjspielman January 6, 2026 16:34
Copy link
Member

@sjspielman sjspielman left a comment

Choose a reason for hiding this comment

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

but we'll see

🫠

lgtm, just one suggestion I think you accidentally missed (adds a space)

Co-authored-by: Stephanie Spielman <[email protected]>
@allyhawkins allyhawkins merged commit 84812bd into development Jan 6, 2026
2 checks passed
@allyhawkins allyhawkins deleted the allyhawkins/sync-main-manuscript branch January 6, 2026 16:40
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.

3 participants