Friday, April 26, 2019

Made with Unity on Linux - New reply to watched thread

Unity Forum

fabioj, derin-gs replied to a thread you are watching at Unity Forum.

Made with Unity on Linux


derin-gs
 
rawfox
How do you manage the collaborated work thing ?
Deozaan
You can go into your settings to get Unity to serialize data (such as scenes) in plain-text format. This makes it a little easier to merge scenes. But you still will often end up with conflicts.
Hey guys, just wanted to add something for you workflows here, as merge conflicts can be pretty annoying: Unity ships with a tool called YAMLMerge that, after setting your project to serialize all your assets to text, will automatically take care of most merges for you. All you have to do is add it to git as a merge tool. Really makes life easier when working with teams.

Source: I work with Unity in teams of 5-10, daily, and YAMLMerge has (as far as I'm concerned) saved lives. I just wish more people would use it!
View This Thread Unread Watched Threads

Please do not reply to this email. You must visit Unity Forum to reply.

This message was sent to you because you opted to watch the thread Made with Unity on Linux at Unity Forum with email notification of new replies. You will not receive any further emails about this thread until you have read the new messages.

If you no longer wish to receive these emails, you may disable emails from this thread or disable all emails.

https://forum.unity.com/