I’m using GitHub for version control on my small-team project. People have edited the same blueprint on multiple branches, and now I have to merge them.
UE5.0 seems to have Git integration (although it’s in beta) which comes with a blueprint merge tool (File → Merge).
However, when I select any version other than the local version it gives me these errors:
Transcript
Aborted Load of /[project folder]/Diff/temp-990416003565546c0a4804c9c/BP_Enemy.uasset because we could
not get the requested revision
Has anyone else got this kind of error before? The [project]/Saved/Diff folder is empty: I assume the error happens when it tries to download from the repo online.
Failing that, does anyone have any other solutions for git merge’ing blueprints?