Github collaborative integration with unity | Brackeys Community | Page 1

fading river Jun 16, 2023, 6:36 AM

#

Me and my friends were working on a project together and we need to collaborate and we tried using github it has conflicts when it comes to the scene data.

dusty tapir Jun 16, 2023, 6:59 AM

#

That means you both edit the same stuffs in the scene that it can't merge automatically?

fading river Jun 16, 2023, 7:10 AM

#

So what is the solution?

dusty tapir Jun 16, 2023, 7:14 AM

#

Realistically, if you both edited the same stuffs, you have to decide whose version of scene to keep anyway.

#

Though, if you can't just keep one of them, you can open the scene file itself in Visual Studio and manually edit the values.

#

The difference should be marked with >>>>> and <<<<< iirc

fading river Jun 16, 2023, 7:26 AM

#

I see

#

Yeah we saw that but the problem is the entire scene is converted to graphic codes right and there's a lot of conflicts which most of time is very confusing whether to delete it or not ......

#

What software would you use to collaborate with others and work a single project?

dusty tapir Jun 16, 2023, 7:35 AM

#

GitHub is fine.
The problem is you didn't clearly define who should be working on which part first.

#

For example, a Cube is placed at (0, 0, 0)
Person A move it to (1, 0, 0)
Person B move it to (0, 0, 1)

What should the program do during merging then?

fading river Jun 16, 2023, 8:22 AM

#

I see

#

We're now trying this git gui called source tree which claims to have a inbuilt unity merge tool

#Github collaborative integration with unity