Commit 121f4619 authored by Richard Mansfield's avatar Richard Mansfield
Browse files

Don't try to merge language repos, just overwrite

parent 3131a550
......@@ -95,7 +95,7 @@ for lang in ${langs} ; do
git checkout --quiet -b ${localbranch} ${remotebranch}
else
git checkout --quiet ${localbranch}
git pull --quiet
git reset --hard -q ${remotebranch}
fi
dirtybranchdir=${dirtylangdir}/${localbranch}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment