# Perspective resource.json and git merge issue

**URL:** <https://forum.inductiveautomation.com/t/perspective-resource-json-and-git-merge-issue/40238>\
**Category:** Ignition\
**Tags:** perspective, ignition80\
**Created:** [November 3, 2020, 3:50pm UTC](https://forum.inductiveautomation.com/t/perspective-resource-json-and-git-merge-issue/40238 "2020-11-03T15:50:22Z")\
**Posts on this page:** 3\
**Page:** 1

<div class="post-metadata">

**Author:** ![kgamble](https://sea1.discourse-cdn.com/inductiveautomation/user_avatar/forum.inductiveautomation.com/kgamble/32/8019_2.png) [@kgamble](https://forum.inductiveautomation.com/u/kgamble)\
**Post date:** [November 3, 2020, 3:50pm UTC](https://forum.inductiveautomation.com/t/perspective-resource-json-and-git-merge-issue/40238/1 "2020-11-03T15:50:22Z")

</div>

I keep having this issue where something I am doing with git keeps causing my resource.json files for perspective to end up in a state like this. I can “accept the incoming changes” in vs code, or I can just manually fix them, but how do I keep this from happening?

It makes scripts show up as packages and it causes a handful of issues, so its a nuisance

```auto
{
  "scope": "G",
  "version": 1,
  "restricted": false,
  "overridable": true,
  "files": [
    "props.json"
  ],
  "attributes": {
    "lastModification": {
<<<<<<< HEAD
      "actor": "kgamble",
      "timestamp": "2020-11-03T15:40:02Z"
    },
    "lastModificationSignature": "7d9896a165425e65f4572544eccf85dcdf2db2d9b93d4dc0284c64b0c2382697"
=======
      "actor": "external",
      "timestamp": "2020-11-03T05:17:57Z"
    },
    "lastModificationSignature": "53925a310569defc33b592abfce75684a868940f069591c0eb538550bdac6e72"
>>>>>>> origin/dev
  }

```

I normally just do the following in order to get started:

```auto
git fetch origin
git merge origin/branch
<make my changes>
git add .
git commit -m "My Message Here"
git push origin branch

```

---

<div class="post-metadata">

**Author:** ![Kevin.Herron](https://sea1.discourse-cdn.com/inductiveautomation/user_avatar/forum.inductiveautomation.com/kevin.herron/32/7259_2.png) [@Kevin.Herron](https://forum.inductiveautomation.com/u/Kevin.Herron)\
**Post date:** [November 3, 2020, 3:55pm UTC](https://forum.inductiveautomation.com/t/perspective-resource-json-and-git-merge-issue/40238/2 "2020-11-03T15:55:06Z")

</div>

> [@kgamble](#):
>

Are you making these changes externally, e.g. in VS code? Or in the designer?

---

<div class="post-metadata">

**Author:** ![kgamble](https://sea1.discourse-cdn.com/inductiveautomation/user_avatar/forum.inductiveautomation.com/kgamble/32/8019_2.png) [@kgamble](https://forum.inductiveautomation.com/u/kgamble)\
**Post date:** [November 3, 2020, 4:09pm UTC](https://forum.inductiveautomation.com/t/perspective-resource-json-and-git-merge-issue/40238/3 "2020-11-03T16:09:58Z")

</div>

I’m making my changes In the designer and fetching from a remote git lab instance

But when this happens it makes the designer think whatever object (script, view, etc.) is a folder, and so I can’t open it until I manually go fix the resource.json