Enable rebuilding PRs with conflicts #4210

Job	Run time
Resolve environment (macos-latest, default)	3m 11s
Resolve environment (windows-latest, linked)	3m 4s
Resolve environment (windows-latest, nightly-latest)	2m 50s
Resolve environment (ubuntu-latest, default)	53s
Resolve environment (windows-latest, default)	2m 46s
Resolve environment (macos-latest, nightly-latest)	2m 10s
Resolve environment (ubuntu-latest, nightly-latest)	49s
Resolve environment (ubuntu-latest, linked)	49s
Resolve environment (macos-latest, linked)	3m 6s
	19m 38s

Provide feedback