Package org.eclipse.jgit.errors
Class CheckoutConflictException
- java.lang.Object
-
- java.lang.Throwable
-
- java.lang.Exception
-
- java.io.IOException
-
- org.eclipse.jgit.errors.CheckoutConflictException
-
- All Implemented Interfaces:
java.io.Serializable
public class CheckoutConflictException extends java.io.IOException
Exception thrown if a conflict occurs during a merge checkout.- See Also:
- Serialized Form
-
-
Field Summary
Fields Modifier and Type Field Description private java.lang.String[]
conflicting
private static long
serialVersionUID
-
Constructor Summary
Constructors Constructor Description CheckoutConflictException(java.lang.String file)
Construct a CheckoutConflictException for the specified fileCheckoutConflictException(java.lang.String[] files)
Construct a CheckoutConflictException for the specified set of files
-
Method Summary
All Methods Static Methods Instance Methods Concrete Methods Modifier and Type Method Description private static java.lang.String
buildList(java.lang.String[] files)
java.lang.String[]
getConflictingFiles()
Get the relative paths of the conflicting files
-
-
-
Field Detail
-
serialVersionUID
private static final long serialVersionUID
- See Also:
- Constant Field Values
-
conflicting
private final java.lang.String[] conflicting
-
-
Constructor Detail
-
CheckoutConflictException
public CheckoutConflictException(java.lang.String file)
Construct a CheckoutConflictException for the specified file- Parameters:
file
- relative path of a file
-
CheckoutConflictException
public CheckoutConflictException(java.lang.String[] files)
Construct a CheckoutConflictException for the specified set of files- Parameters:
files
- an array of relative file paths
-
-
Method Detail
-
getConflictingFiles
public java.lang.String[] getConflictingFiles()
Get the relative paths of the conflicting files- Returns:
- the relative paths of the conflicting files (relative to the working directory root).
- Since:
- 4.4
-
buildList
private static java.lang.String buildList(java.lang.String[] files)
-
-