ConflictSide (@NotNull Resolution resolution, @NotNull VirtualFile root) { assert resolution == Resolution.AcceptedYours || resolution == Resolution.AcceptedTheirs; boolean isReversed = myReverseRoots.contains(root); boolean acceptYours = !isReversed ? resolution == Resolution.AcceptedYours : resolution == Resolution.AcceptedTheirs; return acceptYours ? ConflictSide.OURS : ConflictSide.THEIRS; }