Open Jorgeromeu opened 2 years ago
ok, from the initial research I've done it seems that the main issue is that we are all working directly in the scene. The unity YAML scenes are just not manually mergeable (the format is not intended to be editable directly) so there are two main solutions:
What do you all think? how should we go about this?
I suggest we use both approaches. Suggestion 2 we can start implementing (for most things) but for 1 we need a bit more research to figure out what plugin to use.
Throughout the gamejam phase we had a lot of issues with the git workflow... many features had to be implemented several times and merges were almost never resolvable. To avoid this we should invest time into setting up a good workflow with git to avoid issues like this.
This is especially important now, as we are working in a decentralised way so issues in the workflow are much slower to resolve than when we were working more directly