Hi,
Does anyone have a strategy to enable more than one team member to work on puzzles (in the same project) simultaneously?
When our team develops non-puzzle code, we use the time-tested git pull request workflow. Two developers can work on different areas of the same file because they can merge the changes.
I do use git with our Verge3D projects, but the automatic merging of changes to the visual_logic.xml is almost impossible because of the way this file is automatically generated. Blockly tends to smear changes throughout the XML file and diff-ing the file is difficult.
Is there a solution to this? Is there a more modular way we could develop puzzles? For instance, what if we could have more than one puzzle assembly and each assembly had its own namespace and corresponding XML file? I know that was not part of the Blockly design, but I can dream.
Thanks!
.
