Forum Discussion
Power BI developer mode (.pbip) merge conflict issues
Let me know if you find a solution to this problem. Right now its really stopping me from fully using versioning, because I need to do a manual copy-over merge every now and then.
I'm still not aware of any solutions to this problem. Every release becomes hell and comes down to numerous merges/cherry picks flavored with manual edits.
- sausaged2 years agoFrequent Visitor
That sounds awful.
During my research on this issue, I found this "project" to improve exactly the sorting issues we are experiencing.
I haven't checked in detail, but maybe this is relevant and might even be a viable workaround:
https://richardswinbank.net/ssas/ssas_tabular_merge_conflicts
Do let me know if this could work- Anonymous1 year agoNot applicable
sausaged Thanks a lot for sharing this! In essence model.bim turned out to be a json file, so we can actually play around with its content just as with report.json. I took the idea you shared as a basis and wrote my own simple Python code that sorts the contents of all nested structures, just because it's easier for us to maintain it in Python rather than with shell. We've been testing this approach for a couple of weeks now and I must say that now if conflicts do arise, they are intuitive and resolved in the code editor, so thank you again.
- sausaged1 year agoFrequent Visitor
Anonymous That's great to hear. Are you able to share a working version of this python script? This might be helpful for many users!