search

bmizerany / perks

Effective Computation of Things
BSD 2-Clause "Simplified" License
187 stars 54 forks source link

Broken but fast #14

Closed beorn7 closed 9 years ago

beorn7 commented 9 years ago

This branch is actually not broken anymore. We fixed it some time ago. :)

Could that be merged into master? Would make deployment on our side easier...

Thanks.

beorn7 commented 9 years ago

@bmizerany Friendly ping...

bmizerany commented 9 years ago

Can you squash there commits and we'll merge.

beorn7 commented 9 years ago

@bmizerany broken-but-fast is your own branch. So this all is happening in your branch, which I cannot modify. I can create a new PR from my fork with the squashed commits, if you want. But perhaps it's simpler if you squash directly in the branch this PR is coming from.

beorn7 commented 9 years ago

(Sidenote: I advise against squashing as these commits are already used out there. If a commit has been distributed to the public, it should not be changed by rebasing.)

bmizerany commented 9 years ago

@u-c-l Commits in a branch, especially one prefixed with "broken" shouldn't be used in the wild with the expectation the commits will still be valid. I will not break git-bisect by merging broken code into master if I can help it.

Thank you for your help. I forgot this was my branch, I'll update.

bmizerany commented 9 years ago

Merged. Thank you!