Search Issue Tracker
Won't Fix
Votes
0
Found in
2017.1.0a6
Issue ID
897226
Regression
No
Rename+Rename defaults to Choose Theirs
Rename+Rename defaults to Choose Theirs
1. What happened?
Two users renamed the same texture to two different names. One user published their changes and the other user updated to grab them. For the user that pulled those changes, there was no merge conflict. Instead, Collab auto-merged to select the other user's changes, Choose Theirs.
2. How to repro?
a) User1 creates a project with a texture (tested with .png, .psd, may affect other texture types) (ex, A.png) and publishes to Collab.
b) User2 downloads the project from Collab.
c) User1 renames A.png to B.png then Publishes.
d) User2 renames A.png to C.png, saves project and Updates.
Expected: Merge conflict on C.png based on the name difference. Give user the option to Choose Mine or Choose Theirs.
Actual: Auto selects User1's changes, disregarding User2.
All about bugs
View bugs we have successfully reproduced, and vote for the bugs you want to see fixed most urgently.
Latest issues
- [macOS] Editor window is not restored to previous position when launching the Editor and mouse cursor is on a different screen
- [Usability] Warning message in an Adaptive Probe Volume Component is not informative enough when Realtime Global Illumination is enabled
- Inspector for Adaptive Probe Volumes is not repainted when toggling Realtime Global Illumination setting in the Lighting Window
- Surface Inputs are not rendering when using the custom BaseShaderGUI
- Reflection Problem custom Cubemap loses its reference when HDR is enabled and the platform is switched
Add comment