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

Remove unused future dependency (again) #72

Merged

Conversation

musicinmybrain
Copy link
Contributor

See #61. While that PR was merged, it ended up having no effect because a commit merged back from master reintroduced the future dependency to requirements.txt.

@lbeckman314 lbeckman314 merged commit 31f99b3 into ohsu-comp-bio:master Dec 9, 2024
6 of 7 checks passed
@lbeckman314
Copy link
Member

lbeckman314 commented Dec 9, 2024

Ah, thank you for catching this (and apologies for the regression) — we will review our development flow to ensure that all features are not overwritten with any future merges or rebases. Thank you @musicinmybrain! 🕵️ 🔎

@lbeckman314
Copy link
Member

lbeckman314 commented Dec 9, 2024

Overview ⚙️

Previous PR: 🔁

Commit reintroducing dependency: ❌

Next Steps 🌀

Favor rebasing over merging when updating feature/fix branches ahead of a merge to main (or whichever "target" branch you're using) — review what changes are actually being committed ✍️

Additional Resources 📚

Why do you merge master into feature? Your feature branch should be an isolated set of commits representing your change. As soon as you merge master into feature you've 'polluted' your commit.

If you needed a change committed to master after you branched your feature, you should use rebase. Think of a rebase (in this sense) as making your branch again, right now, with the commits you've already made on that feature branch.

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.

2 participants