updateGit

.gitignore

@@ -9,3 +9,4 @@ download/*
 git/*
 tmp/*
 secret/*
+config/updateGit.conf

bin/updateGit.sh

@@ -347,6 +347,7 @@ echo -e "\nThe git will now pull in ${CURRENT_BRANCH}"
 checkContinue
 git pull
 
+printKazError "\nCheck if any confict"
 #XXX check conflict
 
 echo -e "\nThe git will now push in ${CURRENT_BRANCH}"