feat(essentials): add enableMergeConflictPrompt configuration setting
#10355
| Job | Run time |
|---|---|
| 1m 13s | |
| 1m 56s | |
| 5m 53s | |
| 0s | |
| 5m 15s | |
| 6m 7s | |
| 5m 9s | |
| 6m 23s | |
| 5m 33s | |
| 5m 53s | |
| 5m 12s | |
| 7m 6s | |
| 13m 50s | |
| 8m 55s | |
| 5m 42s | |
| 8m 21s | |
| 6m 51s | |
| 5m 26s | |
| 10m 16s | |
| 5m 38s | |
| 4m 35s | |
| 9m 21s | |
| 3m 42s | |
| 2h 18m 17s |