Thanks, Ashley! First, I'll apologize for being a designer on a team of three designers that don't have access to engineers. We are rapidly building a game for a non-technical client. We all work in the same timezone and need to collaborate during our business hours. The game requires all three of us to be able to add images, sounds, and other files throughout the day.
I read the tutorial that you sent, which is great. But I didn't see an easy solution for us.
To not block progress, here is what I've proposed for us to keep working. BTW, our project is a folder based project, and we have the proper gitIgnore, and our UID numbering is 'Random'.
1. Each day, one person will be the designated person who can add files to the project. Only they can push changes that involve project.3proj. They will push those into the Main branch.
2. For the rest of that day, the rest of the team can make changes that don't change project.3proj. They periodically check gitDesktop to verify they are fine. And we communicate all day to avoid conflicts.
3. The next day, we push our changes to our Main branch and communicate and fix conflicts.
We are open to any feedback. We tested this process this morning, and it worked.