Search Issue Tracker
Fixed
Fixed in 2021.3.50f1, 2022.3.61f1, 6000.0.43f1, 6000.1.0b11, 6000.2.0a6
Votes
0
Found in
2021.3.47f1
2022.3.55f1
6000.0.32f1
6000.1.0a9
6000.2.0a1
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
- Redoing creation of Sub Scenes and Cube GameObjects in Hierarchy throws “Assertion failed on expression: 'targetScene != nullptr’” error in Console window
- Selecting “New Sub Scene” after assigning “New Scene” in Sub Scene Script Component throws “Destroying GameObjects immediately is not permitted” in the Console window
- Shader Graph "Zoom Step Size" can be set to 0 even though the zoom still works
- Enabling/Disabling the Deprecated Nodes doesn't apply to the opened Shader Graph unless any Variable is added to the Blackboard
- Group Selection title text size is smaller in renaming than the actual font size
Add comment