Relative Content

Tag Archive for unity-game-enginegithub

Me and my friend are working on the project on Unity, and we use Github as our repository storage. How do we merge?

Basically what happened is, I have made a push but he didn’t, as he didn’t finish working on his part. I was responsible for movement of the player and he is doing level design. I have finished it, and wanted him to test it, so I pushed it to main branch. He have fetched it and tried to pull, but what happened is that his work got stashed in GitHub desktop, and my work appeared on his PC, which is – just player movement and his scene – old version that misses all changes that he have done.