Update merge-and-generate-problems.yml

eric-hjh · web-flow · commit ee62ddb371f7 · 2025-01-02T18:55:26.000+09:00
diff --git a/.github/workflows/merge-and-generate-problems.yml b/.github/workflows/merge-and-generate-problems.yml
@@ -46,7 +46,7 @@ jobs:
               git pull origin $BASE_BRANCH
 
               echo "Attempting to merge PR #$PR..."
-              gh pr merge $PR --squash --admin || {
+              gh pr merge $PR --admin || {
                 echo "Merge failed for PR #$PR. Skipping..."
                 continue
               }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ jobs:`
`46`	`46`	`git pull origin $BASE_BRANCH`
`47`	`47`
`48`	`48`	`echo "Attempting to merge PR #$PR..."`
`49`		`- gh pr merge $PR --squash --admin \|\| {`
	`49`	`+ gh pr merge $PR --admin \|\| {`
`50`	`50`	`echo "Merge failed for PR #$PR. Skipping..."`
`51`	`51`	`continue`
`52`	`52`	`}`