3 Replies Latest reply on Apr 5, 2017 11:49 AM by rareddy

    Odata and Vdb xmi files, issues pushing it to repository.

    mkamat

      Hi All

       

      We have file that maps physical data to UDM. This is stored as xmi file.We also have ODATA layer and have odata.xmi file.

       

      When two developers are working on these files simultaneously making different changes, Git is throwing a merge conflict and not able to merge two totally different changes. Have you guys come across this issue.

       

      We are using

      JBoss Developer Studio

      Teiid Designer to make changes to these files

      Git for repository

       

      At the moment my approach is to find out

       

      1. Is this a Teiid Designer issue?
      2. Is it a Git issue as it doesn't understand what xmi is!

       

      Thanks

      Medha