[stable30] fix(files): Fix having to resolve conflicts twice when dropping files #28386
| Job | Run time |
|---|---|
| 4m 2s | |
| 5m 11s | |
| 8m 4s | |
| 8m 6s | |
| 8m 46s | |
| 9m 30s | |
| 7m 48s | |
| 10m 25s | |
| 7m 58s | |
| 8m 29s | |
| 5s | |
| 1h 18m 24s |
| Job | Run time |
|---|---|
| 4m 2s | |
| 5m 11s | |
| 8m 4s | |
| 8m 6s | |
| 8m 46s | |
| 9m 30s | |
| 7m 48s | |
| 10m 25s | |
| 7m 58s | |
| 8m 29s | |
| 5s | |
| 1h 18m 24s |