diff --git a/.gitignore b/.gitignore index 08c0435..ddfcdde 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ download/* git/* tmp/* secret/* +config/updateGit.conf diff --git a/bin/updateGit.sh b/bin/updateGit.sh index a826d68..908efd1 100755 --- 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}"