Symbol: 
Function: The dialog contains settings for CODESYS Git. For more information about the CODESYS options, see: Dialog: Options
Call: Menu
Table 1. Certificate Handling
Always accept certificate | Disabled by default  : The certificate which is sent by the server is always accepted even if it is not valid. It is not marked as trusted.
|
Accept self signed certificate | Disabled by default : A self-signed certificate is also accepted (these are normally rejected). If the option is not selected and there is no trusted certificate, then you will get an error message. Then you can view the details of the certificate and decide whether or not the connection should be established anyway. |
Table 2. Git Pull/Merge Options
Git Pull / Git Merge | These options affect only Git conflicts. Merge Conflict Strategy Options: Apply automatic mergers (as available): The automatic merge functionalities should be used whenever available for the affected object type. Fail on conflict (do not merge): The merge operation is aborted with an error message if a conflict occurs. Let user resolve conflicts: The conflicts fundamentally have to be handled manually. For more information, see: Merge Conflicts, "Relationship Issues" Use 'ours' for conflicts: CODESYS Git should try to resolve conflicts by always using the contents of the target branch when merging. Use 'theirs' for conflicts: CODESYS Git should try to resolve conflicts by always using the contents of the source branch when merging.
Fast Forward Strategy Options: Use fast-forward if possible: Commits of the source branch, whose time are after a commit which already exists in both branches, are automatically applied while merging. In this case, no merge commit entry is created in the history. If the commits are inconsistent, then no fast forward takes place. No fast forward Fast forward only (fail otherwise): Merging is always attempted with a fast-forward strategy. If the requirements are not fulfilled, then the merge fails with an corresponding message. Typical use case for fast forward: Pull
Commit On Success: : If the pull or merge operation was executed without any conflicts, then a commit is also automatically executed. If the fast forward is successful, then the option has no effect. |
Table 3. Message Reporting
Verbosity Level | Selection of the level of detail: Default: Basic information (for example, command name with information on the success of the action, no details) Verbose: Additional information on results and intermediate steps. Helpful for scripting in operation without the CODESYS user interface.
|