com.microsoft.tfs.core.clients.versioncontrol
Class MergeSummary
java.lang.Object
com.microsoft.tfs.core.clients.versioncontrol.MergeSummary
public final class MergeSummary
- extends java.lang.Object
Describes the results of a merge performed by the three-way merge
implementation.
- Since:
- TEE-SDK-10.1
Constructor Summary |
MergeSummary(int totalCommonLines,
int totalLocalChangedLines,
int totalLatestChangedLines,
int totalCommonChangedLines,
int totalConflictingLines)
|
Methods inherited from class java.lang.Object |
clone, equals, finalize, getClass, hashCode, notify, notifyAll, toString, wait, wait, wait |
MergeSummary
public MergeSummary(int totalCommonLines,
int totalLocalChangedLines,
int totalLatestChangedLines,
int totalCommonChangedLines,
int totalConflictingLines)
getTotalCommonLines
public int getTotalCommonLines()
- Returns:
- the total number of lines in common in the merge
getLocalChangedLines
public int getLocalChangedLines()
- Returns:
- the total number of lines changed between the common file and the
local (workspace) file
getLatestChangedLines
public int getLatestChangedLines()
- Returns:
- the total number of lines changed between the common file and the
latest (server) file
getCommonChangedLines
public int getCommonChangedLines()
- Returns:
- the total number of lines that were changed to the same value in
both the local (workspace) and latest (server) files
getTotalConflictingLines
public int getTotalConflictingLines()
- Returns:
- the total number of conflicting lines in the merge (lines that
changed in both the local and latest files)
© 2015 Microsoft. All rights reserved.