Skip to content

Commit c7a7132

Browse files
committed
dist: build new artifacts
Signed-off-by: Nico Korthout <korthout@users.noreply.github.com>
1 parent da478f7 commit c7a7132

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

dist/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -427,10 +427,9 @@ class Backport {
427427
if (branchExist) {
428428
if (confictResolution === "draft_commit_conflicts") {
429429
return (0, dedent_1.default) `\`\`\`bash
430-
git fetch origin ${target}
431-
git worktree add -d .worktree/${branchname} origin/${target}
430+
git fetch origin ${branchname}
431+
git worktree add --checkout .worktree/${branchname} origin/${target}
432432
cd .worktree/${branchname}
433-
git switch ${branchname}
434433
git reset --hard HEAD^
435434
git cherry-pick -x ${commitShasToCherryPick.join(" ")}
436435
git push --force-with-lease

dist/index.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)