Package com.intellij.openapi.vcs.merge

Interface MergeSessionEx

All Superinterfaces:

MergeSession

public interface MergeSessionEx
extends MergeSession

Represents the state of a multiple file merge operation.

See Also:

MergeProvider2.createMergeSession(java.util.List<com.intellij.openapi.vfs.VirtualFile>)

Nested Class Summary

Nested classes/interfaces inherited from interface com.intellij.openapi.vcs.merge.MergeSession

MergeSession.Resolution

Method Summary

Modifier and Type	Method and Description
void	acceptFilesRevisions(java.util.List<? extends VirtualFile> files, MergeSession.Resolution resolution) Called when user executes "Accept Theirs" or "Accept Ours" action to update file content on disk to the selected version.
void	conflictResolvedForFiles(java.util.List<? extends VirtualFile> files, MergeSession.Resolution resolution) Called after conflict resolution for conflicting files.

Methods inherited from interface com.intellij.openapi.vcs.merge.MergeSession

canMerge, conflictResolvedForFile, getMergeInfoColumns

Method Detail

acceptFilesRevisions

void acceptFilesRevisions(java.util.List<? extends VirtualFile> files,
                          MergeSession.Resolution resolution)
                   throws VcsException

Called when user executes "Accept Theirs" or "Accept Ours" action to update file content on disk to the selected version.

Parameters:

files -

resolution - AcceptedYours or AcceptedTheirs

Throws:

VcsException

conflictResolvedForFiles

void conflictResolvedForFiles(java.util.List<? extends VirtualFile> files,
                              MergeSession.Resolution resolution)

Called after conflict resolution for conflicting files.

Parameters:

files - the conflicting file.

resolution - the used resolution.

See Also:

MergeSession.conflictResolvedForFile(com.intellij.openapi.vfs.VirtualFile, com.intellij.openapi.vcs.merge.MergeSession.Resolution)