Auto-merges git branches into another branch