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
- Highlighter.Highlight does not find window when using class name as window title
- Highlighter.Highlight highlights a different component when multiple components have the same property path
- Highlighter.Highlight does not find elements in an array or list when the array or list is collapsed
- [URP][NRP] RenderPass, BeginSubPass, and EndRenderPass errors are thrown when Native RenderPass is enabled
- D3D11 swapchain error pop-up appears and the Editor shuts down when Generating Lighting with Probe Volumes present
Resolution Note:
Does not meet requirements for an issue we would take for action in YAML Merge.