Panakotta00 Panakotta00

## Unreal Engine - Diff-Merge-Tool Setup.adoc

      
              1 file
            
          
              2 forks
            
          
              4 comments
            
          
              6 stars
            
          
                Panakotta00
                / Unreal Engine - Diff-Merge-Tool Setup.adoc
            
            
              Last active
              November 10, 2023 05:52
            
              
                Use the Unreal Editor as Git Diff/Merge Tool
              
          
    Unreal Engine Asset Diff/Merge-Tool with Git!


Since unreal engines assets are binary encoded classical text based git diff/merge tools will give up on merge conflicts of unreal assets.
But fear not!
You can setup your git environment to actually be able to diff/merge these .uasset files by using already built-in functionallity of the unreal editor!


Creating the PowerShell-Script


First of all do we have to create a small PowerShell-Script that copies the diff files into temporary files and to convert relative paths to absolute ones.