Enable rebuilding PRs with conflicts #4640

Job	Run time
Diagnostic export (ubuntu-latest, nightly-latest)	1m 17s
Diagnostic export (windows-latest, linked)	3m 12s
Diagnostic export (macos-latest, linked)	1m 27s
Diagnostic export (windows-latest, nightly-latest)	3m 43s
Diagnostic export (ubuntu-latest, linked)	1m 20s
Diagnostic export (macos-latest, nightly-latest)	1m 40s
	12m 39s

Provide feedback