Wayback Machinekoobas.hobune.stream
May JUN Jul
Previous capture 13 Next capture
2021 2022 2023
1 capture
13 Jun 22 - 13 Jun 22
sparklines
Close Help
  • Products
  • Solutions
  • Made with Unity
  • Learning
  • Support & Services
  • Community
  • Asset Store
  • Get Unity

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. Login Create account
  • Blog
  • Forums
  • Answers
  • Evangelists
  • User Groups
  • Beta Program
  • Advisory Panel

Navigation

  • Home
  • Products
  • Solutions
  • Made with Unity
  • Learning
  • Support & Services
  • Community
    • Blog
    • Forums
    • Answers
    • Evangelists
    • User Groups
    • Beta Program
    • Advisory Panel

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. Login Create account

Language

  • Chinese
  • Spanish
  • Japanese
  • Korean
  • Portuguese
  • Ask a question
  • Spaces
    • Default
    • Help Room
    • META
    • Moderators
    • Topics
    • Questions
    • Users
    • Badges
  • Home /
avatar image
0
Question by badescuga9 · Apr 23, 2014 at 11:40 AM · prefabscenegit

Git and .scene/.prefab

I am working on a project in unity3d that is collaborative. I have a few questions regarding git repository:

From what i've read, files asset serialisation mode should be Mixed but how does that actually work on .scene/.prefab? It kind of seems awful to not be able to work on the same scene/prefab simultaneously. Does it actually work?

Comment
Add comment
10 |3000 characters needed characters left characters exceeded
▼
  • Viewable by all users
  • Viewable by moderators
  • Viewable by moderators and the original poster
  • Advanced visibility
Viewable by all users

2 Replies

· Add your reply
  • Sort: 
avatar image
0

Answer by fafase · Apr 23, 2014 at 11:47 AM

It works but it is not as easy as with scripts.

What you can do:

  • Create a scene

  • one user at a time modifies the scene and pushes

  • all other users pull and get the modification

What you cannot do:

  • Create a scene

  • All users make modifications

  • All users pull and push -> conflicts

It is possible to find ways, for instance, you can use the editor to place objects in your scene, once you found the proper place, you remove it and add it by script as script merge as supposed to.

Other way, you delegate work (this is how we do), where only the level designers can modify scenes. Programmers only program script. This way we barely get any issue.

Conflicts in scene gets fixed the same way as scripts, you open the scene file in notepad and look for the HEAD and >>>>>> and figured out which is good. Only problem is that it may require thousands of lines to be removed and it is YAML so even though you can easily read it you wont know what it does...

Comment
Add comment · Show 2 · Share
10 |3000 characters needed characters left characters exceeded
▼
  • Viewable by all users
  • Viewable by moderators
  • Viewable by moderators and the original poster
  • Advanced visibility
Viewable by all users
avatar image badescuga9 · Apr 23, 2014 at 01:28 PM 0
Share

Does the integrated Version Control in Unity3d permit multiple users to commit to the same git scene? @fafase

avatar image fafase · Apr 23, 2014 at 01:40 PM 0
Share

I would think so. I am not using it so I cannot confirm anything apart the fact that it cost some $1500 and you need pro which is another $1500.

avatar image
0

Answer by Valentin_B · Apr 23, 2014 at 01:46 PM

Not even the asset server can handle scene versionning/conflicts further than "discard server changes/my changes".

This is a big issue, since this feature is so expensive you'd think they'd have figured out a way to handle modifications within versionned scenes.

One workaround is to only work with separated scenes, and use AdditiveLevelLoading, having each collaborator working within one, and only one, scene.

Another workaround would be to use prefabs containing the entire work of each developper, prefabs that would be instantiated at runtime when the scene is opened.

Comment
Add comment · Share
10 |3000 characters needed characters left characters exceeded
▼
  • Viewable by all users
  • Viewable by moderators
  • Viewable by moderators and the original poster
  • Advanced visibility
Viewable by all users

Your answer

Hint: You can notify a user about this post by typing @username

Up to 2 attachments (including images) can be used with a maximum of 524.3 kB each and 1.0 MB total.

Follow this Question

Answers Answers and Comments

21 People are following this question.

avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image avatar image

Related Questions

Prefab is completly messed up 2 Answers

Passing a prefab between scenes? 1 Answer

Prefab looks different in different scenes 0 Answers

How to save all scene? 1 Answer

How do I select a prefab that was just instantiated from an editor window? 1 Answer


Enterprise
Social Q&A

Social
Subscribe on YouTube social-youtube Follow on LinkedIn social-linkedin Follow on Twitter social-twitter Follow on Facebook social-facebook Follow on Instagram social-instagram

Footer

  • Purchase
    • Products
    • Subscription
    • Asset Store
    • Unity Gear
    • Resellers
  • Education
    • Students
    • Educators
    • Certification
    • Learn
    • Center of Excellence
  • Download
    • Unity
    • Beta Program
  • Unity Labs
    • Labs
    • Publications
  • Resources
    • Learn platform
    • Community
    • Documentation
    • Unity QA
    • FAQ
    • Services Status
    • Connect
  • About Unity
    • About Us
    • Blog
    • Events
    • Careers
    • Contact
    • Press
    • Partners
    • Affiliates
    • Security
Copyright © 2020 Unity Technologies
  • Legal
  • Privacy Policy
  • Cookies
  • Do Not Sell My Personal Information
  • Cookies Settings
"Unity", Unity logos, and other Unity trademarks are trademarks or registered trademarks of Unity Technologies or its affiliates in the U.S. and elsewhere (more info here). Other names or brands are trademarks of their respective owners.
  • Anonymous
  • Sign in
  • Create
  • Ask a question
  • Spaces
  • Default
  • Help Room
  • META
  • Moderators
  • Explore
  • Topics
  • Questions
  • Users
  • Badges