source tree

News & General Discussion
1

Hi dudes ,
we are working 2 in a team so we are using a source control with source tree software. Normally we know how to push and pull but in unity we are getting merge conflicts issue so how to use source tree and all of its stuff?
Thanks in advance. :slight_smile:

2

A couple of tips

  • Turn serialisation to ‘Force Text’
  • Set up your gitignore to ignore everything except the assets and project settings folder. The library in particular should never be included in version control.
  • Don’t work on the same scene at the same time. Use prefabs or additive loading instead.
1 Like
3

@Kiwasi Thank you so much dude , you have helped me a lot . i have more doubts in this can u explain that too,

Doubts:

  1. i am, using Source tree is that ok ?
    2.where to set the git ignore settings ?
  2. As you said we work in different scenes while merging our project merge conflicts are rising how to solve that either to resolve using mine or theirs ?
    4.if i am choosing ’ resolve using Mine ’ then what happened to the changes made by the other person?
4
  1. Yes, that’s fine
  2. In a .gitignore file you keep in your repository
  3. That depends on what is conflicted. If you do not have a gitignore setup, it’s very possible you are getting conflicts on files that should not be under source control to begin with
  4. Their changes are stomped and gone