• Hey Guest! Ever feel like entering a Game Jam, but the time limit is always too much pressure? We get it... You lead a hectic life and dedicating 3 whole days to make a game just doesn't work for you! So, why not enter the GMC SLOW JAM? Take your time! Kick back and make your game over 4 months! Interested? Then just click here!

GameMaker Source Control should I use internal or GHDesktop?

Donald Harris

Donald Harris

Member
So my team has expanded to 3 people. And on my first merge I spent the better half of a day fixing conflicts on the new branch. I was able to get everything cleaned up by the use of SourceTree and GitHub Desktop. SourceTree has a conflict editor built in. My question is how good is the built-in SCM tool in GMS2? Does it ignore things like the ide settings between engineers do it just capture all of that as well? Also how well does it handle conflicts? I know the conflicts can be minimized by me having my team work "further apart" I am working on that. Anyways anyone ever uses the internal GMS Source code manager with GitHub?
 
You must log in or register to reply here.
Top