Unexpected reindex when altering column types for partitioned tables

Applying: Skip index rewriting when possible on ALTER TABLE ALTER COLUMN TYPE for partitioned tables
Using index info to reconstruct a base tree...
M	src/backend/commands/tablecmds.c
Falling back to patching base and 3-way merge...
Auto-merging src/backend/commands/tablecmds.c
CONFLICT (content): Merge conflict in src/backend/commands/tablecmds.c
Patch failed at 0001 Skip index rewriting when possible on ALTER TABLE ALTER COLUMN TYPE for partitioned tables

/ci/repo/worktrees/worktree/rebase-apply/patch:85: trailing whitespace.
 * indexes and constraints that depend on the altered columns. We record the 
/ci/repo/worktrees/worktree/rebase-apply/patch:86: trailing whitespace.
 * objects that need to be deleted here, so they can be dropped by the caller 
/ci/repo/worktrees/worktree/rebase-apply/patch:100: trailing whitespace.
	
/ci/repo/worktrees/worktree/rebase-apply/patch:142: trailing whitespace.
			 * that we won't create duplicate indexes. We rely on postgres 
/ci/repo/worktrees/worktree/rebase-apply/patch:143: trailing whitespace.
			 * automatically attaching existing child indexes to a new 
warning: squelched 3 whitespace errors
warning: 8 lines add whitespace errors.
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

Applying: Skip index rewriting when possible on ALTER TABLE ALTER COLUMN TYPE for partitioned tables
Patch failed at 0001 Skip index rewriting when possible on ALTER TABLE ALTER COLUMN TYPE for partitioned tables

error: sha1 information is lacking or useless (src/test/regress/expected/alter_table.out).
error: could not build fake ancestor
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"