Release 1.4.0 - Githubissues

pwtyler commented 1 year ago

EDIT: develop, not default

Most of these changes are already in master, but were squashed in #397. Because of that, this PR will not be able to be rebased and merged. I'm not confident in any one strategy here because they all seem fairly unpalatable—

we could rebase develop onto main and deal with all the merge conflicts, then re-open this PR. I think this will still be messy.
we could stash any commits that post-date 3734c41, delete develop, check out a fresh copy then cherry-pick them back to develop, then re-open this PR
we could merge this PR (but not rebase) then delete develop and re-create it based off master after 1.4.0 is released.

I'm in favor of the second one ^ but not firmly attached.

jspellman814 commented 1 year ago

@pwtyler By default do you mean develop?

pwtyler commented 1 year ago

@pwtyler By default do you mean develop?

🤦🏻 yes. Will edit my message ^

pantheon-systems / wp-redis

Release 1.4.0 #409