iterate-ui-daemon 0.1.3 → 0.1.5
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/index.js +6 -0
- package/package.json +1 -1
package/dist/index.js
CHANGED
|
@@ -251,6 +251,11 @@ var WorktreeManager = class {
|
|
|
251
251
|
await winnerGit.commit(`iterate: changes from ${winnerBranch}`);
|
|
252
252
|
}
|
|
253
253
|
const winnerDisplayName = winnerBranch.replace("iterate/", "");
|
|
254
|
+
const mainStatus = await this.git.status();
|
|
255
|
+
if (mainStatus.modified.length > 0 || mainStatus.not_added.length > 0 || mainStatus.created.length > 0 || mainStatus.deleted.length > 0) {
|
|
256
|
+
await this.git.add(".");
|
|
257
|
+
await this.git.commit("iterate: save changes before pick");
|
|
258
|
+
}
|
|
254
259
|
try {
|
|
255
260
|
if (strategy === "squash") {
|
|
256
261
|
await this.git.raw(["merge", "--squash", winnerBranch]);
|
|
@@ -630,6 +635,7 @@ function copyUncommittedFiles(cwd, worktreePath) {
|
|
|
630
635
|
filePath = line.slice(3);
|
|
631
636
|
}
|
|
632
637
|
filePath = filePath.trim();
|
|
638
|
+
if (filePath === ".iterate" || filePath.startsWith(".iterate/")) continue;
|
|
633
639
|
if (statusCode === " D" || statusCode === "D ") {
|
|
634
640
|
const dest2 = join2(worktreePath, filePath);
|
|
635
641
|
try {
|