|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||
| Packages that use PreMergeFailedException | |
|---|---|
| com.microsoft.tfs.core.clients.versioncontrol.engines | |
| Uses of PreMergeFailedException in com.microsoft.tfs.core.clients.versioncontrol.engines |
|---|
| Methods in com.microsoft.tfs.core.clients.versioncontrol.engines that throw PreMergeFailedException | |
|---|---|
java.lang.String |
MergeEngine.beginCustomMerge(Conflict conflict,
ThreeWayMerge threeWayMerge)
Sets up a merge for the given conflict so that callers may perform a custom merge process, returning the merge output file that should be written to to complete the merge. |
com.microsoft.tfs.util.process.ProcessRunner |
MergeEngine.beginExternalMerge(Conflict conflict,
ThreeWayMerge threeWayMerge,
com.microsoft.tfs.util.process.ProcessFinishedHandler finishedHandler,
java.io.OutputStream capturedStandardOutput,
java.io.OutputStream capturedStandardError)
Begins an external content merge for the given conflict. |
|
||||||||||
| PREV NEXT | FRAMES NO FRAMES | |||||||||