- Yes, the standalone Git plugin I maintain contains all the build-in fixes before they are submitted to the Engine. This plugin can only be used in you Project Plugins/ directory and it replaces/overloads the build-in “Git (beta version)” with a “Git (dev)” Source Control Provider selection.
- Merge conflicts resolution should work, but I remember that rebase/cherry-pick are not working the same way at the Git level.
Edit: for now, you need to build the git plugin yourself (just put the source in a C++ Project), but I’ll provide a binary release for 4.15 soon™
Edit 2: I’ve release a new version of the standalone Git plugin “v2.0” for UE4.15 with all features and bugfixes developped for UE4.16 and some more 