EGit will have recursive merge strategy in upcoming version 2.4 | Hacker News Reader