Package sonia.scm.repository.spi

Class MergeConflictResult

java.lang.Object

sonia.scm.repository.spi.MergeConflictResult

public class MergeConflictResult
extends Object

Nested Class Summary

Nested Classes

Modifier and Type	Class	Description
static enum	MergeConflictResult.ConflictTypes
static class	MergeConflictResult.SingleMergeConflict

Constructor Summary

Constructors

Constructor	Description
MergeConflictResult()

Method Summary

Modifier and Type	Method	Description
void	addAddedByBoth(String path)
void	addBothModified(String path, String diff)
void	addDeletedByThem(String path)
void	addDeletedByUs(String path)
List<MergeConflictResult.SingleMergeConflict>	getConflicts()

Methods inherited from class java.lang.Object

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

Constructor Details

MergeConflictResult

public MergeConflictResult()

Method Details

getConflicts

public List<MergeConflictResult.SingleMergeConflict> getConflicts()

addBothModified

public void addBothModified(String path,
 String diff)

addDeletedByThem

public void addDeletedByThem(String path)

addDeletedByUs

public void addDeletedByUs(String path)

addAddedByBoth

public void addAddedByBoth(String path)