Skip to content

Commit

Permalink
dist: build new artifacts
Browse files Browse the repository at this point in the history
Signed-off-by: Nico Korthout <[email protected]>
  • Loading branch information
korthout committed May 28, 2024
1 parent 9237785 commit 7e34d5f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion dist/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ class Backport {
if (confictResolution === "draft_commit_conflicts") {
return (0, dedent_1.default) `\`\`\`bash
git fetch origin ${branchname}
git worktree add --checkout .worktree/${branchname} origin/${target}
git worktree add --checkout .worktree/${branchname} ${branchname}
cd .worktree/${branchname}
git reset --hard HEAD^
git cherry-pick -x ${commitShasToCherryPick.join(" ")}
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map

Large diffs are not rendered by default.

0 comments on commit 7e34d5f

Please sign in to comment.