Enable rebuilding PRs with conflicts #4219

Job	Run time
Resolve environment (windows-latest, default)	3m 11s
Resolve environment (windows-latest, linked)	2m 39s
Resolve environment (macos-latest, default)	3m 2s
Resolve environment (ubuntu-latest, nightly-latest)	50s
Resolve environment (ubuntu-latest, default)	53s
Resolve environment (macos-latest, linked)	2m 3s
Resolve environment (ubuntu-latest, linked)	53s
Resolve environment (windows-latest, nightly-latest)	2m 49s
Resolve environment (macos-latest, nightly-latest)	3m 24s
	19m 44s

Provide feedback