I finally made a pull request to enable ‘Blueprint Merge’ with the Git plugin:
https://github.com/EpicGames/UnrealEngine/pull/1043
This is still not finished, as user still need to commit manually the result of the Merge afterward outside of the Engine, because of some odd things like order dependency on operations
This also improve some few bits on history window.