Crash on Blueprint merge during conflict?

SRombauts / UEGitPlugin

Unreal Engine 5 Git LFS 2 Source Control Plugin (beta)

http://srombauts.github.io/UEGitPlugin

MIT License

810 stars 165 forks source link

Crash on Blueprint merge during conflict? #24

Closed abhisheksagi closed 9 years ago

abhisheksagi commented 9 years ago

Hello,

Currently when there is a merge conflict between 2 blueprint files and if I select "Merge" under source control option engine crashes. Is this something your aware of?

Thanks :)

abhisheksagi commented 9 years ago

Ignore my post, I came across this http://srombauts.github.io/UE4GitPlugin/ where you mentioned that your working on it for V1.0 release. Closing this issue.

SRombauts commented 9 years ago

Ok, problem found, I need to work on this soon https://answers.unrealengine.com/questions/181563/471-crash-blueprint-merge-tool-crashes-editor.html?sort=oldest

SRombauts commented 9 years ago

I finally made a pull request to enable 'Blueprint Merge' with the Git plugin: https://github.com/EpicGames/UnrealEngine/pull/1043

SRombauts commented 9 years ago

This has been merged in UnrealEngine master for the upcoming UE4.8 release, so closing the issue