lalph 0.3.17 → 0.3.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cli.mjs +2 -1
- package/package.json +1 -1
- package/src/GitFlow.ts +2 -0
package/dist/cli.mjs
CHANGED
|
@@ -152325,6 +152325,7 @@ But you **do not** need to git push your changes or switch branches.
|
|
|
152325
152325
|
const prd = yield* Prd;
|
|
152326
152326
|
const parsed = parseBranch(targetBranch);
|
|
152327
152327
|
yield* worktree.exec`git fetch ${parsed.remote}`;
|
|
152328
|
+
yield* worktree.exec`git restore --worktree .`;
|
|
152328
152329
|
if ((yield* worktree.exec`git rebase ${parsed.branchWithRemote}`) !== 0) {
|
|
152329
152330
|
yield* prd.flagUnmergable({ issueId });
|
|
152330
152331
|
return yield* new GitFlowError({ message: `Failed to rebase onto ${parsed.branchWithRemote}. Aborting task.` });
|
|
@@ -152867,7 +152868,7 @@ const commandSource = make$36("source").pipe(withDescription("Select the issue s
|
|
|
152867
152868
|
|
|
152868
152869
|
//#endregion
|
|
152869
152870
|
//#region package.json
|
|
152870
|
-
var version = "0.3.
|
|
152871
|
+
var version = "0.3.18";
|
|
152871
152872
|
|
|
152872
152873
|
//#endregion
|
|
152873
152874
|
//#region src/commands/projects/ls.ts
|
package/package.json
CHANGED
package/src/GitFlow.ts
CHANGED
|
@@ -151,6 +151,8 @@ But you **do not** need to git push your changes or switch branches.
|
|
|
151
151
|
|
|
152
152
|
const parsed = parseBranch(targetBranch)
|
|
153
153
|
yield* worktree.exec`git fetch ${parsed.remote}`
|
|
154
|
+
|
|
155
|
+
yield* worktree.exec`git restore --worktree .`
|
|
154
156
|
const rebaseResult =
|
|
155
157
|
yield* worktree.exec`git rebase ${parsed.branchWithRemote}`
|
|
156
158
|
if (rebaseResult !== 0) {
|