fix(files): Fix having to resolve conflicts twice when dropping files #28330
| Job | Run time |
|---|---|
| 2m 53s | |
| 1m 12s | |
| 3m 56s | |
| 5m 14s | |
| 4m 0s | |
| 5m 51s | |
| 7m 11s | |
| 4m 13s | |
| 5m 30s | |
| 3m 44s | |
| 6s | |
| 43m 50s |
| Job | Run time |
|---|---|
| 2m 53s | |
| 1m 12s | |
| 3m 56s | |
| 5m 14s | |
| 4m 0s | |
| 5m 51s | |
| 7m 11s | |
| 4m 13s | |
| 5m 30s | |
| 3m 44s | |
| 6s | |
| 43m 50s |