Merge remote-tracking branch 'origin/enhancements' into enhancements

# Conflicts: # app/src/main/java/app/dependency/update/app/service/UpdateRepoService.java
bibekaryal86 · Jul 24, 2024 · 4c77071 · 4c77071
2 parents 1525096 + 00310e3
commit 4c77071
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/app/src/main/resources/scripts/GRADLE_DEPENDENCIES.sh b/app/src/main/resources/scripts/GRADLE_DEPENDENCIES.sh
@@ -24,6 +24,9 @@ if [ "$PWD" != "$repo_loc" ]; then
     exit 1
 fi
 
+echo "Checkout main branch"
+git checkout main 2>&1
+
 # Create new branch for updates
 echo "Creating new branch"
 git checkout -b "$branch_name" 2>&1

diff --git a/app/src/main/resources/scripts/NPM_DEPENDENCIES.sh b/app/src/main/resources/scripts/NPM_DEPENDENCIES.sh
@@ -25,6 +25,8 @@ if [ "$PWD" != "$repo_loc" ]; then
     exit 1
 fi
 
+echo "Checkout main branch"
+git checkout main 2>&1
 # Create new branch for updates
 echo "Creating new branch"
 git checkout -b "$branch_name" 2>&1

diff --git a/app/src/main/resources/scripts/PYTHON_DEPENDENCIES.sh b/app/src/main/resources/scripts/PYTHON_DEPENDENCIES.sh
@@ -24,6 +24,9 @@ if [ "$PWD" != "$repo_loc" ]; then
     exit 1
 fi
 
+echo "Checkout main branch"
+git checkout main 2>&1
+
 # Create new branch for updates
 echo "Creating new branch"
 git checkout -b "$branch_name" 2>&1