lalph 0.3.16 → 0.3.18

package/dist/cli.mjs

@@ -152314,7 +152314,8 @@ const GitFlowCommit = effect$1(GitFlow, gen(function* () {
    - Include \`References ${options.taskId}\` in each commit message.
    - **DO NOT** commit any of the files in the \`.lalph\` directory.`,
 		reviewInstructions: `You are already on the branch with their changes.
-After making any changes, commit them to the same branch. Do not git push your changes or switch branches.
+After making any changes, **you have to commit them** to the same branch.
+But you **do not** need to git push your changes or switch branches.
 
  - Include \`References {task id}\` in each commit message.
  - **DO NOT** commit any of the files in the \`.lalph\` directory.
@@ -152324,6 +152325,7 @@ After making any changes, commit them to the same branch. Do not git push your c
 			const prd = yield* Prd;
 			const parsed = parseBranch(targetBranch);
 			yield* worktree.exec`git fetch ${parsed.remote}`;
+			yield* worktree.exec`git restore --worktree .`;
 			if ((yield* worktree.exec`git rebase ${parsed.branchWithRemote}`) !== 0) {
 				yield* prd.flagUnmergable({ issueId });
 				return yield* new GitFlowError({ message: `Failed to rebase onto ${parsed.branchWithRemote}. Aborting task.` });
@@ -152866,7 +152868,7 @@ const commandSource = make$36("source").pipe(withDescription("Select the issue s
 
 //#endregion
 //#region package.json
-var version = "0.3.16";
+var version = "0.3.18";
 
 //#endregion
 //#region src/commands/projects/ls.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "lalph",
   "type": "module",
-  "version": "0.3.16",
+  "version": "0.3.18",
   "publishConfig": {
     "access": "public"
   },

package/src/GitFlow.ts

@@ -130,7 +130,8 @@ export const GitFlowCommit = Layer.effect(
    - **DO NOT** commit any of the files in the \`.lalph\` directory.`,
 
       reviewInstructions: `You are already on the branch with their changes.
-After making any changes, commit them to the same branch. Do not git push your changes or switch branches.
+After making any changes, **you have to commit them** to the same branch.
+But you **do not** need to git push your changes or switch branches.
 
  - Include \`References {task id}\` in each commit message.
  - **DO NOT** commit any of the files in the \`.lalph\` directory.
@@ -150,6 +151,8 @@ After making any changes, commit them to the same branch. Do not git push your c
 
         const parsed = parseBranch(targetBranch)
         yield* worktree.exec`git fetch ${parsed.remote}`
+
+        yield* worktree.exec`git restore --worktree .`
         const rebaseResult =
           yield* worktree.exec`git rebase ${parsed.branchWithRemote}`
         if (rebaseResult !== 0) {