stop stashing and use the specified conflict resolution strategy only

netfoundry · Mar 29, 2024 · e31e66d · e31e66d
1 parent d889adb
commit e31e66d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -42,10 +42,6 @@ if [ -n "$(git status --porcelain)" ]; then
   git stash
   git fetch "$INPUT_REMOTE" "$GITHUB_REF:actions-x-temp-branch"
   git switch actions-x-temp-branch
-  STASH_NAME=$(git stash list | awk -F: '/stash@/{print $1}')
-  if [ -n "$STASH_NAME" ]; then
-    git stash pop
-  fi
   git add $INPUT_FILES -v
   git commit -m "$INPUT_MESSAGE"
 else