Package com.google.gerrit.server.query.change

Class ConflictKey

java.lang.Object

com.google.gerrit.server.query.change.ConflictKey

public abstract class ConflictKey
extends Object

Nested Class Summary

Nested Classes

Modifier and Type	Class	Description
static class	ConflictKey.Serializer

Constructor Summary

Constructors

Constructor	Description
ConflictKey()

Method Summary

Modifier and Type	Method	Description
abstract org.eclipse.jgit.lib.ObjectId	commit()
abstract boolean	contentMerge()
static ConflictKey	create(org.eclipse.jgit.lib.AnyObjectId commit, org.eclipse.jgit.lib.AnyObjectId otherCommit, SubmitType submitType, boolean contentMerge)
abstract org.eclipse.jgit.lib.ObjectId	otherCommit()
abstract SubmitType	submitType()

Methods inherited from class java.lang.Object

clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait

Constructor Detail

ConflictKey

public ConflictKey()

Method Detail

create

public static ConflictKey create(org.eclipse.jgit.lib.AnyObjectId commit,
                                 org.eclipse.jgit.lib.AnyObjectId otherCommit,
                                 SubmitType submitType,
                                 boolean contentMerge)

commit

public abstract org.eclipse.jgit.lib.ObjectId commit()

otherCommit

public abstract org.eclipse.jgit.lib.ObjectId otherCommit()

submitType

public abstract SubmitType submitType()

contentMerge

public abstract boolean contentMerge()