Top Description Fields Constructors Methods

org.eclipse.jgit.merge

public final Enum ContentMergeStrategy

Class Inheritance

extends Enum<ContentMergeStrategy>

java.lang.Object
java.lang.Enum
org.eclipse.jgit.merge.ContentMergeStrategy

How to handle content conflicts.

Since: 5.12

Field Summary

Modifier and Type	Field and Description
public static final ContentMergeStrategy	CONFLICT Produce a conflict.
public static final ContentMergeStrategy	OURS Resolve the conflict hunk using the ours version.
public static final ContentMergeStrategy	THEIRS Resolve the conflict hunk using the theirs version.
public static final ContentMergeStrategy	UNION Resolve the conflict hunk using a union of both ours and theirs versions.

Constructor Summary

Access	Constructor and Description
private	ContentMergeStrategy()

Method Summary

Modifier and Type	Method and Description
public static ContentMergeStrategy	valueOf(String name)
public static ContentMergeStrategy[]	values()

Inherited from java.lang.Enum:: clone compareTo describeConstable equals finalize getDeclaringClass hashCode name ordinal toString valueOf

Field Detail

CONFLICT	back to summary
public static final ContentMergeStrategy CONFLICT Produce a conflict.

OURS	back to summary
public static final ContentMergeStrategy OURS Resolve the conflict hunk using the ours version.

THEIRS	back to summary
public static final ContentMergeStrategy THEIRS Resolve the conflict hunk using the theirs version.

UNION

back to summary

public static final ContentMergeStrategy UNION

Resolve the conflict hunk using a union of both ours and theirs versions.

Since: 6.10.1

Constructor Detail

ContentMergeStrategy	back to summary
private ContentMergeStrategy()

Method Detail

valueOf	back to summary
public static ContentMergeStrategy valueOf(String name)

values	back to summary
public static ContentMergeStrategy[] values()