Here's the thing. While Unity files can be merged, they aren't merged very reliably.
According to @Dmarsh12fitch, you can merge .unity files if only the scenes that are inside them change. I don't know whether or not that's true. If it is, I suggest we all have individual scenes, and perhaps then we can simply copy paste objects and manually do the merging ourselves, when release time comes.
Beyond that, I feel as what we should do is simply very frequently push the Unity file. Like Save -> Commit -> Push and it's just everyone's responsibility to frequently git fetch the latest changes.
Here's the thing. While Unity files can be merged, they aren't merged very reliably.
According to @Dmarsh12fitch, you can merge .unity files if only the scenes that are inside them change. I don't know whether or not that's true. If it is, I suggest we all have individual scenes, and perhaps then we can simply copy paste objects and manually do the merging ourselves, when release time comes.
Beyond that, I feel as what we should do is simply very frequently push the Unity file. Like
Save -> Commit -> Pushand it's just everyone's responsibility to frequentlygit fetchthe latest changes.What do you guys think?