#!/bin/bash

while read name url ref; do
	[[ -z "$ref" ]] && ref="master"
	echo $name $ref
	git merge -n $name/$ref
	[[ -f .git/MERGE_HEAD ]] && {
		echo $name $ref >>Next/conflicts
		git reset --hard
	}
done <Next/control 2>&1 | tee Next/merge.log