Merge branch 'releases/v4-flow' of https://github.com/JamesIves/githu…

…b-pages-deploy-action into releases/v4-flow

lib/worktree.js

@@ -47,6 +47,12 @@ function generateWorktree(action, worktreedir, branchExists) {
                 yield (0, execute_1.execute)(`git worktree remove ${worktreedir}`, action.workspace, action.silent);
             }
             yield (0, execute_1.execute)(`git worktree add --no-checkout --detach ${worktreedir}`, action.workspace, action.silent);
+            // Check if the branch is already checked out in any worktree
+            const { stdout: branchList } = yield (0, execute_1.execute)(`git branch`, action.workspace, action.silent);
+            // If the branch is checked out, remove it
+            if (branchList.includes(` ${action.branch}`)) {
+                yield (0, execute_1.execute)(`git branch -D ${action.branch}`, action.workspace, action.silent);
+            }
             const checkout = new GitCheckout(action.branch);
             if (branchExists) {
                 // There's existing data on the branch to check out