Collaboration almost impossible with GitHub

S

Swisspick

Guest
Hello Everyone

I have now tried multiple tools like GitHub, Bit Bucket the vanilla GMS 2 Repository Tool etc. for collaborating with a friend.
This is however almost impossible by the fact that creating folders, objects, scripts etc. also add code to the main file and other files.
Every time someone commits an update, and there has been a change to the amount of objects in the resource folder, there are conflicts.
The kind of conflict that isn't simply solved by choosing what file to keep...

Can't this be removed? Why isn't it possible to create new objects so that they are literally just NEW OBJECTS IN A FOLDER instead of some reference code in some other file.
How does anyone collaborate like this? Create X scripts and sprites before even uploading to a repository?

Does anyone have a solution or a workaround for this problem?

Thanks in Advance
Roman
 

chamaeleon

Member
Hello Everyone

I have now tried multiple tools like GitHub, Bit Bucket the vanilla GMS 2 Repository Tool etc. for collaborating with a friend.
This is however almost impossible by the fact that creating folders, objects, scripts etc. also add code to the main file and other files.
Every time someone commits an update, and there has been a change to the amount of objects in the resource folder, there are conflicts.
The kind of conflict that isn't simply solved by choosing what file to keep...

Can't this be removed? Why isn't it possible to create new objects so that they are literally just NEW OBJECTS IN A FOLDER instead of some reference code in some other file.
How does anyone collaborate like this? Create X scripts and sprites before even uploading to a repository?

Does anyone have a solution or a workaround for this problem?

Thanks in Advance
Roman
No solid, 100% success and happiness achieved workarounds at this point. Read through threads like https://forum.yoyogames.com/index.php?threads/issues-when-using-git-or-svn-with-gms2.23848/ (paying attention to the mention of adding a json merge tool in the git flow)
@FrostyCat's bug ticket https://bugs.yoyogames.com/view.php?id=29196 was closed as resolved and fixed for 2.3.0. But since there are no comments in the ticket indicating what is changing, who knows if it's a totally satisfactory solution.
 
S

Swisspick

Guest
No solid, 100% success and happiness achieved workarounds at this point. Read through threads like https://forum.yoyogames.com/index.php?threads/issues-when-using-git-or-svn-with-gms2.23848/ (paying attention to the mention of adding a json merge tool in the git flow)
@FrostyCat's bug ticket https://bugs.yoyogames.com/view.php?id=29196 was closed as resolved and fixed for 2.3.0. But since there are no comments in the ticket indicating what is changing, who knows if it's a totally satisfactory solution.
Ah... I see
Then lets hope for 2.3.
Did anyone actually already have their hands on the beta? Me and my friend have applied quite fast after the annunciation but still on access...
 

chamaeleon

Member
Ah... I see
Then lets hope for 2.3.
Did anyone actually already have their hands on the beta? Me and my friend have applied quite fast after the annunciation but still on access...
A number of people have their hands on it now and are discussing it in general in the dozen-page thread in the Announcement forum category.
 

FrostyCat

Redemption Seeker
No solid, 100% success and happiness achieved workarounds at this point. Read through threads like https://forum.yoyogames.com/index.php?threads/issues-when-using-git-or-svn-with-gms2.23848/ (paying attention to the mention of adding a json merge tool in the git flow)
@FrostyCat's bug ticket https://bugs.yoyogames.com/view.php?id=29196 was closed as resolved and fixed for 2.3.0. But since there are no comments in the ticket indicating what is changing, who knows if it's a totally satisfactory solution.
I have access to the GMS 2.3 Open Beta, so as the person who originally raised the point, I'll follow up on it.

First, the JSON merge tool fix is no longer necessary. They've adjusted the JSON output to include trailing commas, like so:
GML:
  "RoomOrder": [
    {"name":"Room1","path":"rooms/Room1/Room1.yy",},
  ],
This alternate arrangement avoids the trailing-entry conflicts I described in that topic.

Second, the problem with conflicts in views is also no more. If you look in any GMS 2.3 project (here is one of mine), you will notice that there is no views directory with UUID-named files to fight over. The .yy files are also no longer UUID-named, so the double-add scenario is handled too.

Personally I have not played with source control interactions as much as I should have, even TsukaYuriko was more vocal on the beta forums in this respect than I was. But the biggest system-wide problems are indeed gone, and any improvements going forward are likely tune-ups rather than revamps.
 
S

Swisspick

Guest
I have access to the GMS 2.3 Open Beta, so as the person who originally raised the point, I'll follow up on it.

First, the JSON merge tool fix is no longer necessary. They've adjusted the JSON output to include trailing commas, like so:
GML:
  "RoomOrder": [
    {"name":"Room1","path":"rooms/Room1/Room1.yy",},
  ],
This alternate arrangement avoids the trailing-entry conflicts I described in that topic.

Second, the problem with conflicts in views is also no more. If you look in any GMS 2.3 project (here is one of mine), you will notice that there is no views directory with UUID-named files to fight over. The .yy files are also no longer UUID-named, so the double-add scenario is handled too.

Personally I have not played with source control interactions as much as I should have, even TsukaYuriko was more vocal on the beta forums in this respect than I was. But the biggest system-wide problems are indeed gone, and any improvements going forward are likely tune-ups rather than revamps.
This sounds too good to be true
I hope I can soon work with the 2.3 <3

Thanks for your input!
Roman
 
Top