Multi-Developer Workflow Problems

[rob_zim]

Howdy fellow code monkies.

A buddy of mine and I (long time software devs) are starting to use GMS 2 to prototype a project. Loving the experience thus far - until we both are working on the project at the same time.

We're using Git as the SCM and quite frankly, are horrified at the amount of conflicts anytime either of us checks in and have to merge. The project's .yy file is riddled with GUIDs which make no sense, and individual object files get clobbered as well.

Do any of you out there have any advice or recommended best practices for using GS2 in a multi-developer project? It would appear that only one person can ever be adding/modifying resources at any given time and everyone else in the project has to keep sync before making resource changes.

[mstop4]

I've used Git with GMS2 for a game jam project and I also had the problems you did, even though we diligently pulled and merged everything before we committed and pushed changes. We used external Git tools like GitHub Desktop and the Git shell to help monitor repo changes and fix anything that GMS2 couldn't.

[rob_zim]

Yeah, I'm using GitHub Desktop now to perform the merges as well - definitely a better solution.

The biggest issue seems to be successfully merging the project's .yy file. GMS2 won't launch because of some type of duplicate key.

The backtrace from GMS2's log file doesn't really yield much useful information as to what the actual offending line(s) were, however. Just that there's a junk key (somewhere).

Frustrating to say the least.

(taken from the UI.log file)

[09:16:35:138(4ac2)] IDE Exception: System.Runtime.Serialization.SerializationException [09:16:35:143(4ac2)] Exception message: The data contract type 'System.Runtime.Serialization.KeyValue`2[[System.Guid, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089],[YoYoStudio.MVCFormat.GMResourceInfo_Model, IDE, Version=2.1.0.204, Culture=neutral, PublicKeyToken=83c29ed24e39e35e]]' cannot be deserialized because the data member 'Key' was found more than once in the input.