Issue with the UE asset diff/merge-Tool with Git

Hi I'm currently folowing this guide so git can recognise UE assets when I want to merge my branches https://gist.github.com/Panakotta00/c90d1017b89b4853e8b97d13501b2e62 when I'm runing this first script in power shell it execute correctily at first, UE start loading and the crash with this an error message :
Erroneous editor command: -diff At least two files are needed (for a diff). Run '-diff -h' for more help.
Any Idea of how to fixe this ?
Gist
Use the Unreal Editor as Git Diff/Merge Tool
Use the Unreal Editor as Git Diff/Merge Tool. GitHub Gist: instantly share code, notes, and snippets.
Solution:
Turn out I wasn't suppost to exectute any powershell script by myself If everything is done correctly git will do it when merging...
Jump to solution
3 Replies
capitaine pachat
capitaine pachatOP4d ago
No description
Robb
Robb4d ago
@Panakotta00 heads up
Solution
capitaine pachat
Turn out I wasn't suppost to exectute any powershell script by myself If everything is done correctly git will do it when merging

Did you find this page helpful?