Your comments

If each file is treated individually with just a single solver open at any given time, pieces that have to be moved towards other conflicting files currently have to be stored elsewhere, because right now there can be only 1 conflict resolver open at any time.

So, instead of successively resolving a set of conflicted files, it would make more sense to be able to resolve multiple at the same time (ie. allowing opening multiple solver windows), so that any content (base, our or theirs) can be copy-pasted over from one conflict resolver to another.

This would greatly ease dealing with cases where code has been redistributed, causing conflicts in multiple files.