Fix conflicts

Author: aviskarkc10

commit

@@ -17,18 +17,8 @@ CURRENT_BRANCH=$(eval $CURRENT_BRANCH_CMD)
 
 COMMIT_WITH_BRANCH="git commit -m \"$CURRENT_BRANCH: $1\""
 DEFAULT_COMMIT="git commit -m \"$1\""
-IS_IGNORED=false
 
-for branch in "${IGNORED_BRANCHES[@]}";
-do
-	if [ "$CURRENT_BRANCH" == $branch ]
-	then
-		IS_IGNORED=true
-		break
-	fi
-done
-
-if [ "$IS_IGNORED" == false ]
+if [ "$CURRENT_BRANCH" != "dev" ] && [ "$CURRENT_BRANCH" != "master" ] && [ "$CURRENT_BRANCH" != "qa" ] && [ "$CURRENT_BRANCH" != "uat" ] && [ "$CURRENT_BRANCH" != "staging" ]
 then
   echo "Commiting with branch name -> $CURRENT_BRANCH"
   eval $COMMIT_WITH_BRANCH