Rpg Maker Developers Group

I'd like to know if anyone knows of a good dev workflow with GitHub Desktop that minimizes the risk of merge conflicts happening and ensures that changes aren't overwritten? It doesn't necessarily have to be GitHub Desktop. If there's a better tool that allows for remote collaboration on a VX Ace project I'm all ears.

Hi y'all, apologies for the unconventional question! My team and I are currently working on a VX Ace project together and are using GitHub Desktop for collaboration. While this is pretty convenient, in a lot of cases we've run into frustrations while using it.

The biggest issue is that often times the changes we make clash with each other often. Whenever someone makes a single change on a map for example, it would then also modify System.rvdata2 and MapInfos.rvdata2. Since this is a file type that is exclusive to RPG Maker it means that GitHub can't resolve deltas as well as if we were using MV, which uses jsons. (see first screenshot)



This is understandable, but this effectively leads to only one of us being able to actively work on the project at a time, because if you try to commit changes while the origin changes, it's going to lead to merge conflicts which at best has caused issues (see second screenshot) that could only be resolved by me stashing changes. At worst it eliminates HOURS worth of progress which is what happened to me yesterday.

Protected download

I'm unaware of any threads highlighting this issue, so if there are any please let me know!! I can also provide additional clarification if needed. Thank you very much!