public class FileConflict
extends Object

Nested Classes
Modifier and Type	Class	Description
`static class`	`FileConflict.AddBuilder`
`static class`	`FileConflict.Change`
`static class`	`FileConflict.ModifyBuilder`
`static class`	`FileConflict.RemoveBuilder`
`static class`	`FileConflict.Resolution`
`static class`	`FileConflict.ResolutionBuilder`

All Methods Static Methods Instance Methods Concrete Methods
Modifier and Type	Method	Description
`boolean`	`equals(Object o)`
`String`	`getRelativePath()`
`FileConflict.Resolution`	`getResolution()`
`FileConflict.Change`	`getUpdateChange()`
`FileConflict.Change`	`getUserChange()`
`int`	`hashCode()`
`String`	`prettyPrint()`
`String`	`toString()`
`static FileConflict.AddBuilder`	`userAdded(String path)`
`static FileConflict.ModifyBuilder`	`userModified(String path)`
`static FileConflict.RemoveBuilder`	`userRemoved(String path)`

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

public static FileConflict.AddBuilder userAdded(String path)

public static FileConflict.RemoveBuilder userRemoved(String path)

public static FileConflict.ModifyBuilder userModified(String path)

public FileConflict.Change getUserChange()

public FileConflict.Change getUpdateChange()

public FileConflict.Resolution getResolution()

Class FileConflict