|
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
-
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.
|
