P4.Resolver
is a class for handling resolves in
Helix Core. It is
intended to be subclassed, and for subclasses to override the
resolve()
method. When P4.run_resolve()
is
called with a P4.Resolver
object, it calls the
P4.Resolver.resolve()
method of the object once for each
scheduled resolve.
None.
None.
Returns the resolve decision as a string. The standard Helix Core resolve strings apply:
String | Meaning |
---|---|
|
Accept Yours. |
|
Accept Theirs. |
|
Accept Merge result. |
|
Accept Edited result. |
|
Skip this merge. |
|
Abort the merge. |
By default, all automatic merges are accepted, and all merges with
conflicts are skipped. The P4.Resolver.resolve()
method is
called with a single parameter, which is a reference to a
P4.MergeData
object.