Fix merge conflict handling in the rebuild workflow #11237
| Job | Run time |
|---|---|
| 7m 58s | |
| 3m 39s | |
| 10m 53s | |
| 8m 41s | |
| 3m 41s | |
| 3m 41s | |
| 3m 43s | |
| 11m 40s | |
| 3m 31s | |
| 3m 20s | |
| 3m 17s | |
| 11m 52s | |
| 7m 22s | |
| 3m 40s | |
| 3m 45s | |
| 6m 49s | |
| 10m 50s | |
| 10m 44s | |
| 1h 59m 6s |
| Job | Run time |
|---|---|
| 7m 58s | |
| 3m 39s | |
| 10m 53s | |
| 8m 41s | |
| 3m 41s | |
| 3m 41s | |
| 3m 43s | |
| 11m 40s | |
| 3m 31s | |
| 3m 20s | |
| 3m 17s | |
| 11m 52s | |
| 7m 22s | |
| 3m 40s | |
| 3m 45s | |
| 6m 49s | |
| 10m 50s | |
| 10m 44s | |
| 1h 59m 6s |