Summary

This class encapsulates a single file as part of a MergeJob; basically a file that had a merge conflict when the merge job started.

Assembly

Mercurial.Net.dll

Namespace

Mercurial

Interfaces

Base Types

graph TD Base0["object"]-->Type Interface0["IEquatable<T>"]-.->Type Type["MergeJobConflict"] class Type type-node

Syntax

public class MergeJobConflict : IEquatable<MergeJobConflict>

Name	Summary
MergeJobConflict(MergeJob, string, MergeConflictState)	Initializes a new instance of the `MergeJobConflict` class.

Name	Value	Summary
MergeJob	MergeJob	Gets the `MergeJob` that manages this `MergeJobConflict`.
Path	string	Gets the name of the file this `MergeJobConflict` relates to.
State	MergeConflictState	Gets the current state of the file this `MergeJobConflict` relates to.

Name	Value	Summary
Cleanup()	void	Cleans up temporary files left by the initial merge command (the .base, .local, .orig and .other files.)
Equals(MergeJobConflict)	bool	Indicates whether the current object is equal to another object of the same type.
Equals(object)	bool	Determines whether the specified `object` is equal to the current `object`.
GetFullMergeSubFilePath(MergeJobConflictSubFile)	string	Gets the path (local to the repository) of the sub-file present in the working directory during the merge, for files with merge-conflicts.
GetHashCode()	int	Serves as a hash function for a particular type.
GetMergeSubFileContentsAsBytes(MergeJobConflictSubFile)	byte[]	Gets the contents of the sub-file, as an array of `System.Byte`s.
GetMergeSubFileContentsAsText(MergeJobConflictSubFile)	string	Gets the contents of the sub-file, as a `string`, using `System.Text.Encoding.Default` to decode the contents.
GetMergeSubFileContentsAsText(MergeJobConflictSubFile, Encoding)	string	Gets the contents of the sub-file, as a `string`, using the specified encoding to decode the contents.
GetMergeSubFilePath(MergeJobConflictSubFile)	string	Gets the path (local to the repository) of the sub-file present in the working directory during the merge, for files with merge-conflicts.
Resolve(ResolveCommand)	void	Mark the file as resolved, unresolved, or attempt to merge the file again. Afterwards, update the `State`.
ToString()	string	Returns a `string` that represents this instance.