Enable rebuilding PRs with conflicts #4634

Job	Run time
Diagnostic export (macos-latest, linked)	3m 12s
Diagnostic export (ubuntu-latest, nightly-latest)	1m 21s
Diagnostic export (macos-latest, nightly-latest)	2m 7s
Diagnostic export (windows-latest, linked)	3m 17s
Diagnostic export (ubuntu-latest, linked)	1m 19s
Diagnostic export (windows-latest, nightly-latest)	3m 33s
	14m 49s

Provide feedback