Enable rebuilding PRs with conflicts #4211

Job	Run time
Resolve environment (ubuntu-latest, default)	59s
Resolve environment (macos-latest, linked)	2m 47s
Resolve environment (windows-latest, default)	2m 42s
Resolve environment (windows-latest, linked)	4m 3s
Resolve environment (ubuntu-latest, linked)	53s
Resolve environment (ubuntu-latest, nightly-latest)	50s
Resolve environment (macos-latest, default)	2m 32s
Resolve environment (windows-latest, nightly-latest)	3m 4s
Resolve environment (macos-latest, nightly-latest)	2m 57s
	20m 47s

Provide feedback