Enable rebuilding PRs with conflicts #4213

Job	Run time
Resolve environment (macos-latest, nightly-latest)	3m 2s
Resolve environment (ubuntu-latest, linked)	57s
Resolve environment (windows-latest, nightly-latest)	2m 31s
Resolve environment (macos-latest, default)	2m 41s
Resolve environment (macos-latest, linked)	2m 55s
Resolve environment (ubuntu-latest, default)	51s
Resolve environment (ubuntu-latest, nightly-latest)	54s
Resolve environment (windows-latest, default)	2m 32s
Resolve environment (windows-latest, linked)	2m 34s
	18m 57s

Provide feedback