Class ConflictResult

java.lang.Object
org.apache.subversion.javahl.ConflictResult

public class ConflictResult extends Object
The result returned by the callback API used to handle conflicts encountered during merge/update/switch operations. Includes a poor man's enum for svn_wc_conflict_choice_t.
  • Field Details

    • choice

      private ConflictResult.Choice choice
      A value corresponding to the svn_wc_conflict_choice_t enum.
    • mergedPath

      private String mergedPath
      The path to the result of a merge, or null.
  • Constructor Details

  • Method Details

    • getChoice

      public ConflictResult.Choice getChoice()
      Returns:
      A value corresponding to the svn_wc_conflict_choice_t enum.
    • getMergedPath

      public String getMergedPath()
      Returns:
      The path to the result of a merge, or null.