ContentMergeStrategy (JGit - Parent 6.3.0.202209071007-r API)

java.lang.Object
- java.lang.Enum<ContentMergeStrategy>
- - org.eclipse.jgit.merge.ContentMergeStrategy

All Implemented Interfaces:

Serializable, Comparable<ContentMergeStrategy>
```
public enum ContentMergeStrategy
extends Enum<ContentMergeStrategy>
```
How to handle content conflicts.

Since:

5.12

Enum Constant Summary

Enum Constants
Enum Constant	Description
`CONFLICT`	Produce a conflict.
`OURS`	Resolve the conflict hunk using the ours version.
`THEIRS`	Resolve the conflict hunk using the theirs version.

Method Summary

All Methods Static Methods Concrete Methods
Modifier and Type	Method	Description
`static ContentMergeStrategy`	`valueOf(String name)`	Returns the enum constant of this type with the specified name.
`static ContentMergeStrategy[]`	`values()`	Returns an array containing the constants of this enum type, in the order they are declared.

Methods inherited from class java.lang.Enum
clone, compareTo, equals, finalize, getDeclaringClass, hashCode, name, ordinal, toString, valueOf

Methods inherited from class java.lang.Object
getClass, notify, notifyAll, wait, wait, wait

- Enum Constant Detail
  - CONFLICT
```
public static final ContentMergeStrategy CONFLICT
```
    Produce a conflict.
  - OURS
```
public static final ContentMergeStrategy OURS
```
    Resolve the conflict hunk using the ours version.
  - THEIRS
```
public static final ContentMergeStrategy THEIRS
```
    Resolve the conflict hunk using the theirs version.
- Method Detail
  - values
```
public static ContentMergeStrategy[] values()
```
    Returns an array containing the constants of this enum type, in the order they are declared. This method may be used to iterate over the constants as follows:
    for (ContentMergeStrategy c : ContentMergeStrategy.values()) System.out.println(c);
    Returns:
    
    an array containing the constants of this enum type, in the order they are declared
  - valueOf
```
public static ContentMergeStrategy valueOf(String name)
```
    Returns the enum constant of this type with the specified name. The string must match exactly an identifier used to declare an enum constant in this type. (Extraneous whitespace characters are not permitted.)
    
    Parameters:
    
    name - the name of the enum constant to be returned.
    
    Returns:
    
    the enum constant with the specified name
    
    Throws:
    
    IllegalArgumentException - if this enum type has no constant with the specified name
    
    NullPointerException - if the argument is null