Enable rebuilding PRs with conflicts #4216

Job	Run time
Resolve environment (ubuntu-latest, default)	52s
Resolve environment (windows-latest, linked)	2m 35s
Resolve environment (macos-latest, linked)	3m 5s
Resolve environment (windows-latest, nightly-latest)	2m 34s
Resolve environment (windows-latest, default)	2m 46s
Resolve environment (macos-latest, nightly-latest)	3m 25s
Resolve environment (ubuntu-latest, linked)	59s
Resolve environment (ubuntu-latest, nightly-latest)	50s
Resolve environment (macos-latest, default)	2m 31s
	19m 37s

Provide feedback