Hi
We are a 4 member team. We are experiencing a lot git merge conflicts after 6.0.
Our model file is medium sized. As part of design/development, we update different parts (e.g. classes in the class diagram) and use git to commit changes.
In 5.0 this process used to work, as changes were spread across lines and git could track this well.
In 6.0 all these changes appear on one line, and git has a limit to how much it can merge changes in a line leading to merge conflicts.
I understand the aspect of size reduction introduced in 6.x, but can you please consider adding a setting, that at least keeps line breaks
Attaching some figures FYR (design.mdj is the model file and it has a size of 4.1M)
% ls -lh design/design.mdj
-rw-r--r--@ 1 anilk staff
4.1M Sep 22 18:21 design/design.mdj
# Option 1 - format keeping tabs and line breaks
% python3 -m json.tool design/design.mdj design/design.mdj
% ls -lh design/design.mdj
-rw-r--r--@ 1 anilk staff
20M Sep 22 18:29 design/design.mdj
# Option 2 - format keeping line breaks only
% python3 -m json.tool --indent 0 design/design.mdj design/design.mdj
% ls -lh design/design.mdj
-rw-r--r--@ 1 anilk staff
4.6M Sep 22 19:12 design/design.mdj
Looking at option 1, I agree that there is significant savings in size when compacting the model file - 4.1M vs 20M, but we could also consider option 2 - keeping line breaks only which increases the size to 4.6M. This is small (12%) increase in size but on the plus side, git works well like before over changes spread across multiple lines leading to minimal conflicts.
Would you please consider adding a setting to enable this behavior?
Thanks,
Anil