Closed SRombauts closed 9 years ago
Since 4.3 source control can resolve conflict but this capability has not been added to the Git Plugin
This has been merged in UnrealEngine master for the upcoming 4.8 release with #24
Since 4.3 source control can resolve conflict but this capability has not been added to the Git Plugin