Bump. Would very much like to see this resolved.
I am trying to use the git plugin.
I have created a test project from blank with only 1 actor “KAKI”
When I am pulling changes from the server with changes in the file after I edited it locally I am getting a conflict as expected.
As I am trying to resolve the conflict using the Merge Tool, and using the “Accept Target” button, the engine crashes.
Any Clues? Am I doing something wrong?
Steps to reproduce the problem:
Create Blank Project - Project 1
Create new actor - Actor01
Commit and push files to remote repository
Pull files to different new directory (git repository) - Project 2
Edit Actor01 in Project 2
Commit and Push Project 2 changes to remote
Edit Actor01 in Project 1
Pull changes causing a conflict
Refresh Source Control state for Actor01 - Get “exclamation mark” icon on the actor
Edit Actor01 → File → Merge
View changes (from remote and local side by side)
Click “Accept Target”
Assertion failed: Blueprint [File:D:\Build++UE4+Release-4.16+Compile\Sync\Engine\Source\Editor\Kismet\Private\SCSEditorViewportClient.cpp] [Line: 748]
Just wanted to throw in that I am having the same issue.
Hi, I have also reproduced this in UE4.17.
It does not look like an issue with the Git plugin: the stack does not point to the Git plugin. I’ve already spent some time on this this summer, but will try to look at it with a fresh eye!
Can anyone let me know if this is working with Perforce/Subversion?
I am not sure that anyone is “merging conflicts” on Perforce or Subversion since everything is done to avoid it (with file locking)!
Hi. I opened a pull request with a working solution to fix this issue.
Edit: Was merged for 4.24.