Package com.google.gerrit.extensions.common

Class ConflictsInfo

java.lang.Object
com.google.gerrit.extensions.common.ConflictsInfo
public class ConflictsInfo extends Object
Information about conflicts in a revision.

  • Field Details

    • ours

      public String ours
      The SHA1 of the commit that was used as ours for the Git merge that created the revision.

      Guaranteed to be set if containsConflicts is true. If containsConflicts is false, only set if the revision was created by Gerrit as a result of performing a Git merge.

    • theirs

      public String theirs
      The SHA1 of the commit that was used as theirs for the Git merge that created the revision.

      Guaranteed to be set if containsConflicts is true. If containsConflicts is false, only set if the revision was created by Gerrit as a result of performing a Git merge.

    • containsConflicts

      public Boolean containsConflicts
      Whether any of the files in the revision has a conflict due to merging ours and theirs.

      If true at least one of the files in the revision has a conflict and contains Git conflict markers. The conflicts occurred while performing a merge between ours and theirs.

      If false, and ours and theirs are present, merging ours and theirs didn't have any conflict. In this case the files in the revision may only contain Git conflict markers if they were already present in ours or theirs.

      If false, and ours and theirs are not present, the revision was not created as a result of performing a Git merge and hence doesn't contain conflicts.

  • Constructor Details

    • ConflictsInfo

      public ConflictsInfo()