Skip to content
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.

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

Sync changes from development with removal of merge conflicts #752

Merged
merged 48 commits into from
Apr 23, 2024

Conversation

allyhawkins
Copy link
Member

Let's see if this solves the issues with #750. Merging this would merge all changes from development into main + resolve merge conflicts that are present between the two branches right now.

pre-commit-ci bot and others added 30 commits March 18, 2024 20:22
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.3.2 → v0.3.3](astral-sh/ruff-pre-commit@v0.3.2...v0.3.3)
- [github.com/pre-commit/mirrors-prettier: v3.0.3 → v4.0.0-alpha.8](pre-commit/mirrors-prettier@v3.0.3...v4.0.0-alpha.8)
changed argument to predict_cellassign to make things conistent
…g-when-no-cells

Skip processing if no cells remain after empty droplet filtering
@allyhawkins allyhawkins requested a review from sjspielman April 23, 2024 19:03
@allyhawkins
Copy link
Member Author

@sjspielman can you re-approve? This is the same as #750 I just fixed two conflicts.

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.

👍

@allyhawkins allyhawkins merged commit e10f9fe into main Apr 23, 2024
4 checks passed
@allyhawkins allyhawkins deleted the allyhawkins/merge-conflicts branch April 23, 2024 19:33
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