Search Issue Tracker
Active
Votes
0
Found in
2021.3.47f1
2022.3.55f1
6000.0.32f1
6000.1.0a9
Issue ID
UUM-91595
Regression
No
UnityYAMLMerge does not open fallback merge tool when encountering merge conflicts
Reproduction steps:
1. Download and install "Beyond Compare"
2. Modify lines 15-16 in the "/{PATH_TO_EDITOR}.app/Contents/MacOS/Tools/mergespecfile.txt" file to point to the "bcomp" executable inside of the "Beyond Compare" installation path
3. Open the "IN-90944.zip" project
4. Modify line 14 in the ".git/config" file to point to the UnityYAMLMerge tool from the currently used Editor
5. Run "git checkout main & git merge test & git mergetool" in your Terminal
6. Observe the opened merge tool
Expected result: Beyond Compare is opened
Actual result: FileMerge is opened
Reproducible with: 2021.3.47f1, 2022.3.55f1, 6000.0.32f1, 6000.1.0a9
Reproducible on: macOS 15.1.1 (M1 Max)
Not reproducible on: No other environment tested
All about bugs
View bugs we have successfully reproduced, and vote for the bugs you want to see fixed most urgently.
Latest issues
- Graphics.RenderMeshIndirect does not issue multi-draw rendering commands when using a graphics API capable of multi-draw commands
- Error "InvalidOperationException: An error occured while deserializing asset reference" is thrown when deserializing a BlackboardVariable that is a dynamically loaded monobehavior
- Removing a Camera Component from a Physics 2D Raycaster GameObject brings pop-up message twice
- UnityYAMLMerge does not open fallback merge tool when encountering merge conflicts
- Editor crash when resetting Quality settings after adding "New Group" in Mipmap Limit Groups
Add comment