Class MergeConflictPane


  • public class MergeConflictPane
    extends BaseElement
    The merge conflict resolution UI.
    Since:
    4.2M1
    Version:
    $Id: 833a8d18f72a6e7a1c412a07c87378f4b3476473 $
    • Constructor Detail

      • MergeConflictPane

        public MergeConflictPane()
    • Method Detail

      • getVersionToKeepSelect

        public org.openqa.selenium.support.ui.Select getVersionToKeepSelect()
        Returns:
        the list box used to specify which version to keep
      • getFromVersionSelect

        public org.openqa.selenium.support.ui.Select getFromVersionSelect()
        Returns:
        the list box used to select the 'from' version for comparison
      • getToVersionSelect

        public org.openqa.selenium.support.ui.Select getToVersionSelect()
        Returns:
        the list box used to select the 'to' version for comparison
      • clickShowChanges

        public MergeConflictPane clickShowChanges()
        Clicks the button to show the changes between the selected versions.
        Returns:
        the new merge conflict pane displaying the changes between the selected versions
      • getChanges

        public ChangesPane getChanges()
        Returns:
        the changes between the selected versions