ScriptGitPullOptions¶

class ScriptGitPullOptions.ScriptGitPullOptions¶

Bases: object

Wrapper around _3S.CoDeSys.Git.GitIntegration.IGitPullOptions.

property fail_on_conflict: bool¶

If set, do not create conflicts, but stop and return an error

result after finding the first conflict.

property commit_on_success: bool¶

Automatically create a merge commit, if merging results in no conflict.

This includes conlficts, that have been resolved automatically.

property fast_forward_strategy: GitFastForwardStrategy¶

Defines, if the branch tip should be moved forward instead of creating

an automatic merge commit (see “commit_on_success”) - if applicable.

property resolve_file_conflict_strategy: GitResolveFileConflictStrategy¶

Defines how to automatically resolve conflicts.

property use_auto_merger: bool¶

Defines, whether to apply CODESYS’ “ProjectCompare.IObject3WayMerger” for conflicts.

These are only applied, if “resolve_file_conflict_strategy” is set to

“GitResolveFileConflictStrategy.Normal”.