P
patrikgrinsvall
Guest
Hi!
We are three persons working on the same game, all of us are working as developers as our normal day-time jobs are having game development as hobbies. Normally in modern application development, the version control system is often GIT and process goes something like this:
If you are only two persons and one is working on master and the other one is working in separate branches this is the easiest. If you however are two or three or more persons working on different branches and there are alot of changes to the metadata files, it becomes more or less impossible to merge, and most often you manually need to merge using copy+paste with game maker.
Of course, I understand the need for the yy metadata-files or project files but I'm looking for tips and tricks on how to improve the VCS process.
I didn't find any thread on the forum covering this yet, surely more teams are having the same issue?
We have tried using the built-in version control system of GM but that often ends up breaking the project and you need to revert to last working commit, we therefore use the command line and then resolve the conflicts in the .yy files using an external editor.
Thanks!
We are three persons working on the same game, all of us are working as developers as our normal day-time jobs are having game development as hobbies. Normally in modern application development, the version control system is often GIT and process goes something like this:
- Pull latest master
- `git checkout -b features/your-new-feature`
- <code>
- <review/demo>
- `git checkout master && git merge features/your-new-feature`
- <goto 1>
If you are only two persons and one is working on master and the other one is working in separate branches this is the easiest. If you however are two or three or more persons working on different branches and there are alot of changes to the metadata files, it becomes more or less impossible to merge, and most often you manually need to merge using copy+paste with game maker.
Of course, I understand the need for the yy metadata-files or project files but I'm looking for tips and tricks on how to improve the VCS process.
I didn't find any thread on the forum covering this yet, surely more teams are having the same issue?
We have tried using the built-in version control system of GM but that often ends up breaking the project and you need to revert to last working commit, we therefore use the command line and then resolve the conflicts in the .yy files using an external editor.
- Any .gitignore rules that make life easier?
- Any settings in GM?
- Any other tips and tricks for using git with gm, anything in the process we should change?
Thanks!
Attachments
-
14.4 KB Views: 5