diff --git a/roles/dns/files/update-dns b/roles/dns/files/update-dns index 7f617c137f..1719057af9 100755 --- a/roles/dns/files/update-dns +++ b/roles/dns/files/update-dns @@ -10,7 +10,7 @@ fi cd $destdir git fetch origin -if [ "`git diff origin/master master`" != "" ]; +if [ "`git diff origin/master`" != "" ]; then git pull -X theirs # change context so the chroot can cope