P4ClientMerge Class

ClientMerge object - retains state

Inheritance Hierarchy

SystemObject
Perforce.P4P4ClientMerge

Namespace: Perforce.P4
Assembly: p4api.net (in p4api.net.dll) Version: 2024.2.269.3570

Syntax

public class P4ClientMerge

Public Class P4ClientMerge

public ref class P4ClientMerge

type P4ClientMerge =  class end

The P4ClientMerge type exposes the following members.

Constructors

	Name	Description
	P4ClientMerge	P4ClientMerge Constructor

Methods

	Name	Description
	AutoResolve	AutoResolve
	DetectResolve	Detect if a resolve has been done
	Equals	(Inherited from Object.)
	Finalize	(Inherited from Object.)
	GetBaseFile	GetBaseFile name
	GetBothChunks	GetBothChunks
	GetConflictChunks	GetConflictChunks
	GetHashCode	(Inherited from Object.)
	GetLastError	GetLastError
	GetMergeDigest	GetMergeDigest
	GetResultFile	GetResultFile name
	GetTheirChunks	GetTheirChunks
	GetTheirDigest	GetTheirDigest
	GetTheirFile	GetTheirFile name
	GetType	(Inherited from Object.)
	GetYourChunks	GetYourChunks
	GetYourDigest	GetYourDigest
	GetYourFile	GetYourFile name
	IsAcceptable	Check that the merge is acceptable
	MemberwiseClone	(Inherited from Object.)
	Resolve	Do a resolve
	ToString	(Inherited from Object.)