Hello all,
I have a problem when trying to merge branches for my game project. Me and my team work very independently, and a lot of the time they will pull any particular commit from the Master branch, push a ton of commits to it on their own branch, and then present their branch back to me for merging back into the master, but when i try to do that, I end up with a conflict in the YYP file which i cannot resolve. The problem is that no matter what version of the YYP file i go with to solve the merge, I will end up with missing references for objects and different things inside of the project from either branch. This is unacceptable, of course.
I attempted to use the program YAML from one of our own forum moderators, but it appears that YAML is out of date for the latest builds of GMS2, and no longer works. Ive seen there may be a better way to deal with this in the latest version of GMS2. Does anyone know that better way to handle these awful YYP merging issues?
Thanks!
I have a problem when trying to merge branches for my game project. Me and my team work very independently, and a lot of the time they will pull any particular commit from the Master branch, push a ton of commits to it on their own branch, and then present their branch back to me for merging back into the master, but when i try to do that, I end up with a conflict in the YYP file which i cannot resolve. The problem is that no matter what version of the YYP file i go with to solve the merge, I will end up with missing references for objects and different things inside of the project from either branch. This is unacceptable, of course.
I attempted to use the program YAML from one of our own forum moderators, but it appears that YAML is out of date for the latest builds of GMS2, and no longer works. Ive seen there may be a better way to deal with this in the latest version of GMS2. Does anyone know that better way to handle these awful YYP merging issues?
Thanks!