We are working on our first Git project and we've tried to establish ground rules to not create merge issues after reading the SVN tutorial and discussing with others who have used Git with C3 on a team.
However, we ran into an issue and are looking for a little help (and now we have a new guideline rule!)
Ashley I am pretty sure the issue is this: I added an object w/ animations and committed to the repo. After that, another team member created another sprite object w/ animations and committed to the repo, they had not pulled my commit before doing that (they were working on separate layout and event sheets, so we thought they would not collide.) However after the merge, we get an error when opening the project.
Here's the error:
Tracing it down, I see that in the project object's JSON files, the duplicated IDs are the spriteImageIDs. I was looking how to change this, but it was not obvious, I could not find a C3 project file that indicated what png files are associated with the spriteImageIDs or the list of image files to be loaded, etc.
Do you have any suggestions on how to fix? This would just be a one time fix, we would change our git policy for adding objects with animations to sync up. (We have the biggish hammer of reverting and reimplementing after a pull to sync up, but we wanted to see if we could save that work.)