with the help of CODESYS Git
dialog. With the help
in the CODESYS Git help
the Merge Conflicts help
as follows: Helpful