Question: Rpg Maker MV Using GIT Collaboration, how to avoid merge conflicts

ratnik

Warper
Member
Joined
May 15, 2020
Messages
3
Reaction score
0
First Language
English
Primarily Uses
RMMV
I am using GIT with a few friends, and we keep getting merge conflicts on the same few files.

Game.rpgproject
data/MapInfos.json
data/System.json

Does anyone have a system, or gitignore they use to collaborate on GIT?
 

Shaz

Veteran
Veteran
Joined
Mar 2, 2012
Messages
39,394
Reaction score
12,925
First Language
English
Primarily Uses
RMMV
I don't use git, but everything in data except the Map###.json files forms the database, and that is saved every time you hit the save button, even if you haven't made any changes. So if all you've done is worked on a map, when you commit, all the database files will be committed too.

You might be able to allocate one person to handle the database, and get everyone else to not commit those files, but unfortunately the System.json file will get updated even when you're working only on maps, as that's the file that contains the switch and variable names.

Do a bit of a search through the forum, as collaboration is a topic that comes up from time to time, and you'll see a few suggestions of different ways people deal with it.
 

TheoAllen

Self-proclaimed jack of all trades
Veteran
Joined
Mar 16, 2012
Messages
5,291
Reaction score
6,050
First Language
Indonesian
Primarily Uses
RMVXA
Specify those files in .gitignore

Do note that mapinfos might be important. Since it holds the map tree in your editor. So if anyone adds a map, it will update the mapinfos.json
 

Users Who Are Viewing This Thread (Users: 0, Guests: 1)

Latest Threads

Latest Profile Posts

lunarrosecrow wrote on hiddenone's profile.
please don't lurk hiddenone I'm quarantining!!!
lunarrosecrow wrote on Edward.T's profile.
Hello Edward sorry to bother you and didn't start a conversation cause I thought i'd be a little weird or disrespectful but I was wondering do you still have your Generator resources you posted as the links on the page are dead?
Stream will be live shortly! It is my birthday, and thus I am doing an extended stream! I will be doing a variety of things. Among the activities I will be doing: Playing Oceanhorn: Monster of the Uncharted Seas, art, and some Text Adventure~ Feel free to drop by!
It would be cool if you could "copy as code" event commands :< .
Just managed to recover my Yahoo e-mail that i lost 3 months ago. Turns out an IP from U.S had hacked it and set the pass back to normal.. Like WTF ?

Forum statistics

Threads
99,485
Messages
965,921
Members
131,111
Latest member
HannyBee21
Top