fix(pre-commit): handle unmerged files #2788

Job	Run time
Lint package	1m 35s
Build and Test (ubuntu-22.04, 3.11)	2m 42s
Build and Test (ubuntu-22.04, 3.9)	3m 11s
Build and Test (ubuntu-22.04, 3.10)	2m 51s
Test GitHub action for `secret scan`	27s
Build and Test (macos-13, 3.10)	3m 43s
Build and Test (macos-13, 3.11)	4m 4s
Build and Test (ubuntu-22.04, 3.12)	2m 46s
Build and Test (macos-13, 3.12)	3m 35s
Build and Test (windows-2022, 3.10)	5m 14s
Build and Test (windows-2022, 3.12)	5m 17s
Build and Test (windows-2022, 3.11)	5m 12s
build_os_packages / Build packages (macos-13, x86_64, 6378dfd22f58bb553ddb02be28304d739cd730c1f95c15c74955c923a1bc3d6...	2m 42s
Build and Test (windows-2022, 3.9)	5m 2s
build_os_packages / build_wheel_sdist	31s
build_os_packages / Build packages (ubuntu-22.04, rockylinux/rockylinux:8, e8d7ed8c6f8c6f85cd083d5051cafd8c6c01d09eca...	2m 0s
Build and Test (macos-13, 3.9)	3m 51s
build_os_packages / Build packages (macos-14, aarch64, 5fdc0f6a5b5a90fd3c528e8b1da8e3aac931ea8690126c2fdb4254c84a3ff0...	1m 36s
build_os_packages / Build packages (windows-2022)	2m 24s
build_os_packages / linux_package_smoke_tests (rockylinux/rockylinux:8.8)	27s
build_os_packages / linux_package_smoke_tests (rockylinux/rockylinux:9)	43s
build_os_packages / linux_package_smoke_tests (opensuse/leap)	1m 15s
build_os_packages / linux_package_smoke_tests (debian:stable)	14s
build_os_packages / linux_package_smoke_tests (ubuntu:latest)	14s
Push Docker image to Docker Hub and GitHub Packages	0s
	1h 1m 36s

Provide feedback