# Merge Conflict Git

**URL:** <https://forum.inductiveautomation.com/t/merge-conflict-git/114314>\
**Category:** Ignition\
**Tags:** ignition83, perspective\
**Created:** [March 4, 2026, 2:08pm UTC](https://forum.inductiveautomation.com/t/merge-conflict-git/114314 "2026-03-04T14:08:38Z")\
**Posts on this page:** 4\
**Page:** 1

<div class="post-metadata">

**Author:** ![devjlep](https://avatars.discourse-cdn.com/v4/letter/d/d2c977/32.png) [@devjlep](https://forum.inductiveautomation.com/u/devjlep)\
**Post date:** [March 4, 2026, 2:08pm UTC](https://forum.inductiveautomation.com/t/merge-conflict-git/114314/1 "2026-03-04T14:08:38Z")

</div>

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 ?

---

<div class="post-metadata">

**Author:** ![Noah\_Burnette](https://sea1.discourse-cdn.com/inductiveautomation/user_avatar/forum.inductiveautomation.com/noah_burnette/32/83777_2.png) [@Noah\_Burnette](https://forum.inductiveautomation.com/u/Noah_Burnette)\
**Post date:** [March 4, 2026, 2:20pm UTC](https://forum.inductiveautomation.com/t/merge-conflict-git/114314/2 "2026-03-04T14:20:13Z")

</div>

Hi,

Could you share your `.gitignore`?

The details for implementing version control can be found [here](https://www.docs.inductiveautomation.com/docs/8.3/tutorials/version-control-guide).

---

<div class="post-metadata">

**Author:** ![devjlep](https://avatars.discourse-cdn.com/v4/letter/d/d2c977/32.png) [@devjlep](https://forum.inductiveautomation.com/u/devjlep)\
**Post date:** [March 4, 2026, 2:41pm UTC](https://forum.inductiveautomation.com/t/merge-conflict-git/114314/3 "2026-03-04T14:41:19Z")

</div>

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 ?

---

<div class="post-metadata">

**Author:** ![Noah\_Burnette](https://sea1.discourse-cdn.com/inductiveautomation/user_avatar/forum.inductiveautomation.com/noah_burnette/32/83777_2.png) [@Noah\_Burnette](https://forum.inductiveautomation.com/u/Noah_Burnette)\
**Post date:** [March 4, 2026, 2:58pm UTC](https://forum.inductiveautomation.com/t/merge-conflict-git/114314/4 "2026-03-04T14:58:39Z")

</div>

The `valuePersistence` documentation can be found [here](https://www.docs.inductiveautomation.com/docs/8.3/platform/tags/tag-properties#value-properties)

> **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.