Unity account

You need a Unity Account to shop in the Online and Asset Stores, participate in the Unity Community and manage your license portfolio. Create account

Language

Question by mimmomarc · Mar 26, 2020 at 02:47 PM · git github conflict

Help with conflicts in Git

Hello, I use Git to share my unity project with a friend. Unfortunately we have come into conflict and I am using Atom to solve it. In this regard I have two questions: Is there any (simpler) software to help you resolve conflicts in a Unity scene? Is there a method that allows you to obtain the Local Identifier In File of a Gameobject?

(Sorry for my bad english)

Add comment · Show 1

Hellium · Mar 26, 2020 at 02:53 PM 0

Share

I use the tool provided by Unity which works fine in almost all the cases.

https://docs.unity3d.com/$$anonymous$$anual/Smart$$anonymous$$erge.html