) have changed from the base [...] all colliding changes [...] . All changes with a conflict
CODESYS Development System
changes in your current [...] , changed some lines [...] are compared and the changed
changed paths : All changes [...] and only changes within
GitRemoteCollection GitChangeKind GitChange [...] ScriptGitElement ScriptGitTreeEntryChangesCollection ScriptGitTreeEntryChanges
the working copy Changes [...] Discards your changes [...] Commits your changes
, the program changes [...] and the program changes [...] . Then the program changes back
to save changes [...] that comments your change [...] local changes
the changes [...] . An extending change [...] . The change is accepted
should be changed in the generic [...] change is effective [...] or not the change becomes
CODESYS Development System
, online changes [...] , online changes [...] and cannot be changed in this dialog