repo git: Solve conflicts by merging, instead of rebasing. Fixes #1106