selecting "Replace All Conflicts" still prompts me for each conflicting file
Bug watches keep track of this bug in other bug trackers.