ScriptGitMergeStatus¶

class ScriptGitMergeStatus.ScriptGitMergeStatus(value, names=None, *, module=None, qualname=None, type=None, start=1, boundary=None)¶

Bases: Enum

Extends the GitMergeStatus-Enum with the Codesys Conflicts for scripting.

UpToDate = 0¶

Merge was up-to-date.

FastForward = 1¶

Fast-forward merge.

NonFastForward = 2¶

Non-fast-forward merge.

Conflicts = 3¶

Merge resulted in git conflicts.

RelationshipIssues = 4¶

Merge resulted in Codesys conflicts.