Features

Recursive Merge

JGit now supports the "recursive" merge strategy and it's the default for merge/pull ( bug 380314). It is based on the "resolve" strategy but can handle more than one merge base. See merge strategies in the Git documentation for a description.