Skip to content

Commit

Permalink
Merge pull request #423 from korthout/korthout-fix-draft-checkout
Browse files Browse the repository at this point in the history
Checkout draft branch instead of target in suggestion
  • Loading branch information
korthout authored May 28, 2024
2 parents f73aeb9 + 8fef44e commit 9237785
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/backport.ts
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ export class Backport {
if (confictResolution === "draft_commit_conflicts") {
return dedent`\`\`\`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

0 comments on commit 9237785

Please sign in to comment.