I two branches from main: fix.main.base and fix.main.rebase. Then I rebased release-next into fix.main.base:
git rebase origin/release-next
There were two conflicting files from the commits in #647 which has not been brought into main yet.
I left fix.main.base alone, so we could target it in this PR and see what happens before committing to main. I'm hoping that fix.main.base is identical to release-next after merging this PR. If it is, we can do another PR for fix.main.base to main.
I two branches from
main:fix.main.baseandfix.main.rebase. Then I rebasedrelease-nextintofix.main.base:There were two conflicting files from the commits in #647 which has not been brought into main yet.
I left
fix.main.basealone, so we could target it in this PR and see what happens before committing to main. I'm hoping thatfix.main.baseis identical torelease-nextafter merging this PR. If it is, we can do another PR forfix.main.basetomain.