Search Issue Tracker
By Design
Votes
0
Found in
5.5.0f3
Issue ID
894304
Regression
No
New objects are not added to scene after update when old object has merge conflict
To reproduce:
1. Set up a project with Collaborate and two developers
2. Developer 1 creates a cube and pushes the change
3. Developer 2 downloads this change
4. Developer 1 and 2 both change the location of the cube
5. Developer 1 adds another cube to the scene (or any other change)
6. Developer 1 commits
7. Developer 2 downloads this change and receives a merge conflict
8. Developer 2 chooses "Choose Mine"
Expected: On the second computer: after 8th step 1st cube location will be the same as it was set in 5th step, and another cube will appear in scene
Actual: cube is not added to scene
Reproduced on: 5.5.0f3, 5.5.3f1, 5.6.0f3, 2017.1.0a6
All about bugs
View bugs we have successfully reproduced, and vote for the bugs you want to see fixed most urgently.
Latest issues
- Crash on ShaderLab::ShaderState::ApplyShaderState when entering Play Mode and calling ShaderWarmup.WarmupShaderFromCollection with a shader that has dynamic_branch
- Crash on operator delete[] when a serializable structure in the System namespace is serialized by a MonoBehaviour
- [macOS] forward and backward mouse buttons are recognized as middle mouse button
- NavMeshModifier.OnEnable/OnDisable gets progressively slower when called repeatedly
- "System.Net.CookieContainer" throws an "ArgumentException" error when using a non-UTF-8 machine locale and hostname
Add comment