Merge branches to trunk before building.
Don't try to provide a message (since git doesn't support this).
Fail build if merge fails.
Merge 'merge-forward-git': Merge before testing, when using git.