updateGit

2 years ago · b876c66f5f
2 changed files with 2 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -9,3 +9,4 @@ download/*
 git/*
 tmp/*
 secret/*
+config/updateGit.conf
--- a/bin/updateGit.sh
+++ b/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}"