| ▲ | tonyedgecombe 2 days ago | |
That has changed. I'm not sure when but it definitely asks me if I want to replace or merge. | ||
| ▲ | eviks 14 hours ago | parent | next [-] | |
But not changed enough, I can't merge everything from the top, I can only do that whenever the first Mergeable conflict appears, but there could be a bunch more of conflicts with Replace option only | ||
| ▲ | tonyedgecombe a day ago | parent | prev [-] | |
Just checked and this behaviour came with Lion in 2011. | ||