Enable rebuilding PRs with conflicts #4633

Job	Run time
Diagnostic export (ubuntu-latest, linked)	1m 22s
Diagnostic export (macos-latest, linked)	1m 57s
Diagnostic export (windows-latest, nightly-latest)	3m 41s
Diagnostic export (macos-latest, nightly-latest)	1m 45s
Diagnostic export (ubuntu-latest, nightly-latest)	1m 22s
Diagnostic export (windows-latest, linked)	3m 36s
	13m 43s

Provide feedback