Summary
Mark the file as resolved, unresolved, or attempt to merge the file again. Afterwards,
update the
State.
- Assembly
- Mercurial
.Net .dll - Namespace
- Mercurial
- Containing Type
- MergeJobConflict
Syntax
public void Resolve(ResolveCommand command = null)Remarks
Note that the
MergeTool property is not overridden here,
which means that a visual, third-party, merge tool might pop up and ask the user
for help. To avoid this, override the merge tool yourself.
Parameters
| Name | Type | Description |
|---|---|---|
| command | ResolveCommand |
Any extra options to the resolve method, or null for default options.
|
Return Value
| Type | Description |
|---|---|
| void |