Implement the new Operation "Resolve" for Git 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

Closed SRombauts closed 9 years ago

SRombauts commented 10 years ago

Since 4.3 source control can resolve conflict but this capability has not been added to the Git Plugin

SRombauts commented 9 years ago

This has been merged in UnrealEngine master for the upcoming 4.8 release with #24