resolve #228: git sync abort edge case
convert brackets to do/end
Merge branch 'master' into cr-testCleanup