search

clauswilke / PeptideBuilder

A simple Python library to generate model peptides
MIT License
79 stars 30 forks source link

WIP: Only black #30

Closed Seanny123 closed 4 years ago

Seanny123 commented 4 years ago

Only Black this time, I swear.

clauswilke commented 4 years ago

I'm not sure what your workflow is, but something doesn't look right. In your local checkout, the following should work:

git checkout master
git fetch upstream
git merge upstream/master
git checkout -b black-branch
<... apply black ...>
<... push and create PR...>
Seanny123 commented 4 years ago

Yeah, I was figuring that out myself. I think it's because I use git rebase where you use git merge. I'll switch over. My apologies, this is the first time I've hit this problem.

clauswilke commented 4 years ago

In my experience, rebase creates lots of little issues that merge avoids, and if we squash-merge the PR in the end it makes no difference, so it's better to just use merge all the time.

Also, whenever possible, it's best to bring master up to date first in your local checkout, then create the branch, then make the changes, then create the PR, so that the PR only contains the commits that actually contain the new changes. This isn't always possible, but it's good to keep in mind as a general best-practices workflow.