Search Issue Tracker
Won't Fix
Votes
0
Found in [Package]
2019.4
2019.4.9f1
Issue ID
1296849
Regression
No
SmartMerge with UnityYAMLMerge tool fails when using Sourcetree
How to reproduce:
1. Download the provided "PreMerge" and "Master" projects
2. Make a repository on GitHub
3. Push the "Master" project on its own branch
4. Push the "PreMerge" project up its own branch
5. Clone the repository using Sourcetree
6. Push "Master" branch into "PreMerge" branch
7. Inspect the merge conflicts
8. Try resolving the conflicts by using Resolve Conflicts->Launch External Merge Tool (Merge tool can be located at <Path to Unity>/Unity.app/Contents/Tools/UnityYAMLMerge)
9. Inspect the results
Expected result: Conflicts are resolved
Actual result: Conflicts are not resolved and the merge fails silently with a prompt shown briefly
Reproducible with: 2019.4.24f1
Documentation on how to set up Smart Merge on Sourcetree: https://docs.unity3d.com/Manual/SmartMerge.html
Add comment
All about bugs
View bugs we have successfully reproduced, and vote for the bugs you want to see fixed most urgently.
Latest issues
- Texture Map Viewer shows "Loading..." text instead of indicating users that Baked Texture Maps are missing
- "Analyze Import Process" button misaligned in Import Activity window
- Text in “Baked Shadowmask” mode is difficult to read in Baked Lightmap Viewer when Editor theme is set to Light
- Mesh wireframe is difficult to see in Baked Lightmap Viewer window when texture opacity is maximized
- Informational text does not wrap and does not fit when the Viewer Window is opened by default
Resolution Note:
Does not meet requirements for an issue we would take for action in YAML Merge.