Forum Discussion

Oimat's avatar
Oimat
Icon for Helper I rankHelper I
1 year ago
Solved

Git and PBIR mixes everything

Hello,  In my git folder, I have multiple subfolders containing pbir files. Every time I merge a branch into another one, parts of json from a pbir gets mixed in the json of another pbir. Every time...
Need Help
  • Oimat's avatar
    Oimat
    1 year ago

    Okay, I think I found the solution.

    I should stash my files before changing from one branch to the other, otherwise changed files from reports go populate other branches too and create thousands of conflicts.

    I'll have to do a 

    git stash

    everytime before I do a

    git checkout

     

    With code projects I never had this particular issue, but with lots of json files from pbip the problem is increased thousandfold. 

Oimat's avatar
Oimat
Icon for Helper I rankHelper I
1 year ago

If you are managing multiple .pbir reports, store each .pbir in a separate Git repository or Git submodule. This ensures changes in one report don't affect another.

 

That should not be the case anyway, as git should not merge files between each other. It seems to be a git issue not knowng how to solve jsons files, but I cannot find the problem anywhere. 

I also am not going to create 10+ git repositories. And I mispoke, the file is in .pbip but I always get a banner saying that the file is using PBIR report format, which I don't know why.