The P4ClientMerge type exposes the following members.

Methods

  Name Description
Public method AutoResolve
AutoResolve
Public method DetectResolve
Detect if a resolve has been done
Public method Equals
Determines whether the specified Object is equal to the current Object.
(Inherited from Object.)
Protected method Finalize
Allows an Object to attempt to free resources and perform other cleanup operations before the Object is reclaimed by garbage collection.
(Inherited from Object.)
Public method GetBaseFile
GetBaseFile name
Public method GetBothChunks
GetBothChunks
Public method GetConflictChunks
GetConflictChunks
Public method GetHashCode
Serves as a hash function for a particular type.
(Inherited from Object.)
Public method GetLastError
GetLastError
Public method GetMergeDigest
GetMergeDigest
Public method GetResultFile
GetResultFile name
Public method GetTheirChunks
GetTheirChunks
Public method GetTheirDigest
GetTheirDigest
Public method GetTheirFile
GetTheirFile name
Public method GetType
Gets the Type of the current instance.
(Inherited from Object.)
Public method GetYourChunks
GetYourChunks
Public method GetYourDigest
GetYourDigest
Public method GetYourFile
GetYourFile name
Public method IsAcceptable
Check that the merge is acceptable
Protected method MemberwiseClone
Creates a shallow copy of the current Object.
(Inherited from Object.)
Public method Resolve
Do a resolve
Public method ToString
Returns a String that represents the current Object.
(Inherited from Object.)

See Also