Commit 5e823fd
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -49,24 +49,8 @@ async function main() { | |||
| 49 | 49 | continue | |
| 50 | 50 | } | |
| 51 | 51 | ||
| 52 | - // Try to rebase onto current beta branch | ||
| 53 | - console.log(` Attempting to rebase PR #${pr.number}...`) | ||
| 54 | - const rebase = await $`git rebase beta pr-${pr.number}`.nothrow() | ||
| 55 | - if (rebase.exitCode !== 0) { | ||
| 56 | - console.log(` Rebase failed for PR #${pr.number} (has conflicts)`) | ||
| 57 | - await $`git rebase --abort`.nothrow() | ||
| 58 | - await $`git checkout beta`.nothrow() | ||
| 59 | - skipped.push({ number: pr.number, reason: "Rebase failed (conflicts)" }) | ||
| 60 | - continue | ||
| 61 | - } | ||
| 62 | - | ||
| 63 | - // Move rebased commits to pr-${pr.number} branch and checkout back to beta | ||
| 64 | - await $`git checkout -B pr-${pr.number}`.nothrow() | ||
| 65 | - await $`git checkout beta`.nothrow() | ||
| 66 | - | ||
| 67 | - console.log(` Successfully rebased PR #${pr.number}`) | ||
| 68 | - | ||
| 69 | - // Now squash merge the rebased PR | ||
| 52 | + // Try to squash merge the PR directly | ||
| 53 | + console.log(` Attempting to merge PR #${pr.number}...`) | ||
| 70 | 54 | const merge = await $`git merge --squash pr-${pr.number}`.nothrow() | |
| 71 | 55 | if (merge.exitCode !== 0) { | |
| 72 | 56 | console.log(` Squash merge failed for PR #${pr.number}`) | |
0 commit comments