GitHub Team Projects For beginners And Merging Problems

Unity Engine
1

Hi,
I’ve been trying to work on a project with my friend in unity. So i searched up how to do so and was directed to source control and github. I’ve set it up but I believe there are a few problems.
What i’ve done:

  • Downloaded github and cloned project to desktop
  • Set to Visible Meta Files and Force Text
  • Saved unity project into repo
  • When i save i make changes to files, i commit and sync
  • my friend does the same thing
  • Problems - Regular problems with merging scenes. Also a lot of files are sent back and forth that are not directly made by me.

Please can you try to run me through what the steps we need to do to access the same files and what you do. Please explain as if you are telling a 5 year old because we don’t understand most jargon and stuff

Thanks for all the help!

NB One of us uses VS on WIndows and the other uses Monodevelop in Mac

NOTE
I’ve found the problem. For some reason the gitignore file isnt working. How do i fix or where exactly do i put it

2

Put it in the root folder of the project, it should be named “.gitignore” - including the period (.)

1 Like