Merge Conflict Git

Ignition
,
1

I am trying to add git for my existing ignition project.

I work in 2 differents branchs where i add or modify tags on each. So the “valueStore.idb” is modified and when i do a merge of one branch on the other one, there is a conflict.

How to manage conflict issues ?

Is it related to the propertie “Value Persistence” of the tag ?

2

Hi,

Could you share your .gitignore?

The details for implementing version control can be found here.

3

Hi,
Yeah the .gitignore was wrong. Thanks

I have another question related to : for some tags, il need to persist some data. Like the docs said, i need to change the “Value Persistence” of the tag value to configuration.

How can i change that for existing tags ?

And what are the impact for performance ?

4

The valuePersistence documentation can be found here

Configuration: Memory tag value changes will persist to the tag configuration. This option should be used sparingly to avoid performance hits.

My naive approach would be to only store constants or anything that doesn't change during run time. I can't speak from experience on a measurable performance hit when using this option.

1 Like