Merge pull request #422 from korthout/korthout-fix-draft-conflict-sug…

…gestions Suggest to fetch and checkout draft pr branch directly
korthout · May 28, 2024 · da478f7 · da478f7
2 parents 7d390fd + 863937d
commit da478f7
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/backport.ts b/src/backport.ts
@@ -614,10 +614,9 @@ export class Backport {
     if (branchExist) {
       if (confictResolution === "draft_commit_conflicts") {
         return dedent`\`\`\`bash
-        git fetch origin ${target}
-        git worktree add -d .worktree/${branchname} origin/${target}
+        git fetch origin ${branchname}
+        git worktree add --checkout .worktree/${branchname} origin/${target}
         cd .worktree/${branchname}
-        git switch ${branchname}
         git reset --hard HEAD^
         git cherry-pick -x ${commitShasToCherryPick.join(" ")}
         git push --force-with-lease