Uses of Class
com.microsoft.tfs.core.clients.versioncontrol.MergeFlags

Packages that use MergeFlags
com.microsoft.tfs.core.clients.versioncontrol   
com.microsoft.tfs.core.clients.versioncontrol.soapextensions   
 

Uses of MergeFlags in com.microsoft.tfs.core.clients.versioncontrol
 

Fields in com.microsoft.tfs.core.clients.versioncontrol declared as MergeFlags
static MergeFlags MergeFlags.ALWAYS_ACCEPT_MINE
          Instructs the server to discard any changes from the source, keeping only changes from the target.
static MergeFlags MergeFlags.BASELESS
          Instructs the server to perform a baseless merge between items
static MergeFlags MergeFlags.CONSERVATIVE
          Instructs the server to be conservative while declaring merges as conflicts.
static MergeFlags MergeFlags.FORCE_MERGE
          Instructs the server to re-merge source versions which have been previously merged
static MergeFlags MergeFlags.NO_AUTO_RESOLVE
          Used only on the client.
static MergeFlags MergeFlags.NO_IMPLICIT_BASELESS
          Only works prior on TFS 2008, instructs the server to not implicitly baseless merge items with the same relative path from the source root and target root.
static MergeFlags MergeFlags.NO_MERGE
          Instructs the server to not actually pend the merge, but just return a preview of what needs to be merged
static MergeFlags MergeFlags.NONE
           
static MergeFlags MergeFlags.SILENT
          Instructs the server to supress any get operations and conflicts.
 

Methods in com.microsoft.tfs.core.clients.versioncontrol that return MergeFlags
 MergeFlags MergeFlags.combine(MergeFlags other)
           
static MergeFlags MergeFlags.combine(MergeFlags[] values)
           
 MergeFlags MergeFlags.remove(MergeFlags other)
           
 MergeFlags MergeFlags.retain(MergeFlags other)
           
 

Methods in com.microsoft.tfs.core.clients.versioncontrol with parameters of type MergeFlags
 MergeFlags MergeFlags.combine(MergeFlags other)
           
static MergeFlags MergeFlags.combine(MergeFlags[] values)
           
 boolean MergeFlags.contains(MergeFlags other)
           
 boolean MergeFlags.containsAll(MergeFlags other)
           
 boolean MergeFlags.containsAny(MergeFlags other)
           
 MergeCandidate[] VersionControlClient.getMergeCandidates(java.lang.String sourcePath, java.lang.String targetPath, RecursionType recursion, MergeFlags mergeFlags)
          Look up the merge candidates for merging between the requested items.
 MergeFlags MergeFlags.remove(MergeFlags other)
           
 MergeFlags MergeFlags.retain(MergeFlags other)
           
 

Uses of MergeFlags in com.microsoft.tfs.core.clients.versioncontrol.soapextensions
 

Methods in com.microsoft.tfs.core.clients.versioncontrol.soapextensions with parameters of type MergeFlags
 MergeCandidate[] Workspace.getMergeCandidates(java.lang.String sourcePath, java.lang.String targetPath, RecursionType recursion, MergeFlags mergeFlags)
          Look up the merge candidates for merging between the requested items.
 GetStatus Workspace.merge(ItemSpec sourceSpec, java.lang.String targetPath, VersionSpec sourceVersionFrom, VersionSpec sourceVersionTo, LockLevel lockLevel, MergeFlags mergeFlags, java.lang.String[] itemPropertyFilters)
          Merge changes made between two versions to items in a given source path into a given target path.
 GetStatus Workspace.merge(java.lang.String sourcePath, java.lang.String targetPath, VersionSpec sourceVersionFrom, VersionSpec sourceVersionTo, LockLevel lockLevel, RecursionType recursion, MergeFlags mergeFlags)
           
 GetStatus Workspace.merge(java.lang.String sourcePath, java.lang.String targetPath, VersionSpec sourceVersionFrom, VersionSpec sourceVersionTo, LockLevel lockLevel, RecursionType recursion, MergeFlags mergeFlags, java.lang.String[] itemPropertyFilters)
           
 



© 2015 Microsoft. All rights reserved.