Skip to content

Reduce git conflicts

Adjust TwinCAT settings to reduce changes.

TwinCat Line Ids

Line IDs are required for debug reasons, but there are generated automatically at TwinCAT build. They should not be part of source controlled files, since no merge support for that. With activated SeparateLineIDs flag they are outsourced to separate file.  Ignore it from git repository:

index

image2020-11-23_10-29-13

Minimize Id changes

Reduce changes of IDs at PLC settings.

image2020-11-23_10-31-21

TwinCAT product version at each file

Disable writing TwinCAT product version to each PLC file:

image2020-11-23_10-34-47

image2020-11-23_10-35-10