ui.json & Git merge

[JE-VS]

Hi all,

I have a question regarding the ui.json file during a Git merge.

Two branches were created to work on two different pages (obviously, with their own GUI components, backend functions, ...). So far, so good.

However, when performing a merge of the two branches, Git got totally confused with the ui.json file, due to the highly similar structure of each component description.

I solved it by doing some JSON rebuilding by hand, but it is clearly not the way to go.

I was then wondering if there was a good practice or recommendations when working with different branches ? Or simply something that I missed ? How do you do to handle or avoid this situation ?

Thanks a lot! Best,

[FabienArcellier]

Hi @JE-VS,

Thanks for the feedback, we are aware of the limitations of the ui.json file. We plan to work on that for next release.

We think of implementing several changes :

• using one line in the json file per component (less lisible but conflict are easier to manage)
• using another format as json line to reduce boilerplate
• split ui.json in several file (one per page)

Unfortunately, I don't know easy strategy to handle merge conflict today. When it happen, I have to rebuild the file by hand.

I will try to publish an online tool to merge 2 ui.json file in one. The task is easy, it's just is not easy to handle through git. I let you know.

[JE-VS]

Thanks @FabienArcellier

Great to read there are some thoughts on this issue!

Meanwhile, I was also thinking about writing a short Python script to help for future merges.
But if you have a tool, ready to try it too.

Best,

[FabienArcellier]

I haven't finally, sorry about that. I don't think I will have time to develop this in the next few weeks.

[JE-VS]

No worries! Thanks anyway ;)