search

standardebooks / web

The source code for the Standard Ebooks website.
https://standardebooks.org
Creative Commons Zero v1.0 Universal
234 stars 61 forks source link

Rebase onto master at 794e175 and re-add code reviewed so far #364

Closed colagrosso closed 3 months ago

colagrosso commented 3 months ago

You'll have to force push this PR to db-rewrite because it rewrites history.

There are no functional changes in this PR. It brings what you've already reviewed in #346, #351, #353, and #354 to be current with master at 794e175d47599d634c1457d12075c3ad7d9d7dae (the latest commit as of an hour ago).

Steps:

  1. git pull master
  2. git switch db-rewrite
  3. git checkout -b db-rewrite_may_20_rebase_794e175
  4. git rebase master
  5. Fix merge conflicts
  6. Fix PHPStan errors now that it's stricter

I hope this should be a straightforward PR because the code has already been reviewed.

If it looks good, I'll follow up with a tidy PR that completes the DB write path and will be much easier to review than #363 would have been.

acabal commented 3 months ago

I can't merge this in because Github says there are tons of merge conflicts. I think you should just abandon this PR and start a new one. Right now this PR is incomprehensible, it contains changes that already exist in master so everything is confused.

You should be able to force push to branches on this repo yourself. Are you able to do that?

colagrosso commented 3 months ago

I'm very sorry for the trouble. I'll close this PR.

You should be able to force push to branches on this repo yourself. Are you able to do that?

I triple checked, and you're correct. I thought I had permission to push only to the old covers branch, but I am able to force push to db-rewrite. I'll do that now, and this will make a lot more sense.

colagrosso commented 3 months ago

Sorry for the extra message on this PR. The force push to db-rewrite worked as expected, and now comparing db-rewrite to master also looks good. That is, db-rewrite contains the 18 commits that have been reviewed so far, and they apply cleanly on top of master:

https://github.com/standardebooks/web/compare/db-rewrite

I will use force pushes to db-rewrite to keep the branch in this state.

More work to come. Thanks for your patience.