# Problem using git to collaborate remotely

**URL:** <https://forum.inductiveautomation.com/t/problem-using-git-to-collaborate-remotely/34087>\
**Category:** Ignition\
**Created:** [April 21, 2020, 6:22pm UTC](https://forum.inductiveautomation.com/t/problem-using-git-to-collaborate-remotely/34087 "2020-04-21T18:22:16Z")\
**Posts on this page:** 3\
**Page:** 1

<div class="post-metadata">

**Author:** ![salvador.sanchez](https://avatars.discourse-cdn.com/v4/letter/s/bb73d2/32.png) [@salvador.sanchez](https://forum.inductiveautomation.com/u/salvador.sanchez)\
**Post date:** [April 21, 2020, 6:22pm UTC](https://forum.inductiveautomation.com/t/problem-using-git-to-collaborate-remotely/34087/1 "2020-04-21T18:22:16Z")

</div>

I’m setting up the remote repo so I can collaborate with my coworkers, everything was fine until I tried to merge branches, I solved conflicts choosing manually the files to update,to update windows I updated: resource.json and window.bin inside the window folder in the repo but when I see it in the designer the window is a Folder no a window. Is there something I’m missing?? What should I do to update properly the project files and see my coworker’s windows updates properly??

---

<div class="post-metadata">

**Author:** ![pturmel](https://sea1.discourse-cdn.com/inductiveautomation/user_avatar/forum.inductiveautomation.com/pturmel/32/3295_2.png) [@pturmel](https://forum.inductiveautomation.com/u/pturmel)\
**Post date:** [April 21, 2020, 7:57pm UTC](https://forum.inductiveautomation.com/t/problem-using-git-to-collaborate-remotely/34087/2 "2020-04-21T19:57:13Z")

</div>

I would not expect this to work with the binary files Ignition uses for its Vision window and template resources.

---

<div class="post-metadata">

**Author:** ![salvador.sanchez](https://avatars.discourse-cdn.com/v4/letter/s/bb73d2/32.png) [@salvador.sanchez](https://forum.inductiveautomation.com/u/salvador.sanchez)\
**Post date:** [April 21, 2020, 9:03pm UTC](https://forum.inductiveautomation.com/t/problem-using-git-to-collaborate-remotely/34087/3 "2020-04-21T21:03:04Z")

</div>

Thanks for the aswer, thats the conclusion I got to. I’m doing a workaround, each time I’m gonna merge I choose manually wich version of the file save for every conflict not the merge. I’m using the instructions `$ git checkout --ours path/to/file` and `$ git checkout --theirs path/to/file`. If someone have a better idea how to work whit remote repo let me know.