Merge Conflicts A merge operation merges the contents of two branches which have a common ancestor but have received different changes. Targeted merging of branches is mainly done in the Git Branches
Using the Git Scripting Interface CODESYS Git provides a scripting interface for Git. Examples of how to use the interface are shown below. For more information, see: Script Engine API Documentation R
Reference, User Interface :
View: Git Status & Staging Symbol: Corresponding Git command: git status Function : The view shows the Git status of the objects and files which have changed or are new since the last commit. Changes
View: Git History Corresponding Git command: git log Function : The view shows the history of the commits which were performed on the objects of the project or on other files in the Git repository . T
View: Git Branches Symbol: Corresponding Git command: git branch Function : The local Git branches are displayed and managed in the view. These can be branches which are already tracking a remote bran
View: Git Remotes Symbol: Corresponding Git command: git remote Function : The view is used to manage the remote repositories , which are used to manage CODESYS projects on where multiple users should
View: Project Settings Function : This view shows the current project settings for the CODESYS project ("Git project") which is managed in Git with the help of CODESYS Git . Call : Git → Project Setti
Dialog: Credentials needed Function : The dialog is used to provide the credentials for access to the remote repository . Call : The dialog opens when you want to access a protected remote repository