@postman-cse/onboarding-repo-sync 2.6.7 → 2.7.0
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/action.cjs +6 -1
- package/dist/cli.cjs +6 -1
- package/dist/index.cjs +6 -1
- package/package.json +1 -1
package/dist/action.cjs
CHANGED
|
@@ -114534,7 +114534,12 @@ var RepoMutationService = class {
|
|
|
114534
114534
|
break;
|
|
114535
114535
|
}
|
|
114536
114536
|
if (fetch2.exitCode === 0) {
|
|
114537
|
-
const rebase = await this.execute("git", [
|
|
114537
|
+
const rebase = await this.execute("git", [
|
|
114538
|
+
"rebase",
|
|
114539
|
+
"-X",
|
|
114540
|
+
"theirs",
|
|
114541
|
+
"FETCH_HEAD"
|
|
114542
|
+
]);
|
|
114538
114543
|
if (rebase.exitCode !== 0) {
|
|
114539
114544
|
await this.execute("git", ["rebase", "--abort"]);
|
|
114540
114545
|
const cause = rebase.stderr || rebase.stdout || "Failed to rebase generated changes";
|
package/dist/cli.cjs
CHANGED
|
@@ -112639,7 +112639,12 @@ var RepoMutationService = class {
|
|
|
112639
112639
|
break;
|
|
112640
112640
|
}
|
|
112641
112641
|
if (fetch2.exitCode === 0) {
|
|
112642
|
-
const rebase = await this.execute("git", [
|
|
112642
|
+
const rebase = await this.execute("git", [
|
|
112643
|
+
"rebase",
|
|
112644
|
+
"-X",
|
|
112645
|
+
"theirs",
|
|
112646
|
+
"FETCH_HEAD"
|
|
112647
|
+
]);
|
|
112643
112648
|
if (rebase.exitCode !== 0) {
|
|
112644
112649
|
await this.execute("git", ["rebase", "--abort"]);
|
|
112645
112650
|
const cause = rebase.stderr || rebase.stdout || "Failed to rebase generated changes";
|
package/dist/index.cjs
CHANGED
|
@@ -114557,7 +114557,12 @@ var RepoMutationService = class {
|
|
|
114557
114557
|
break;
|
|
114558
114558
|
}
|
|
114559
114559
|
if (fetch2.exitCode === 0) {
|
|
114560
|
-
const rebase = await this.execute("git", [
|
|
114560
|
+
const rebase = await this.execute("git", [
|
|
114561
|
+
"rebase",
|
|
114562
|
+
"-X",
|
|
114563
|
+
"theirs",
|
|
114564
|
+
"FETCH_HEAD"
|
|
114565
|
+
]);
|
|
114561
114566
|
if (rebase.exitCode !== 0) {
|
|
114562
114567
|
await this.execute("git", ["rebase", "--abort"]);
|
|
114563
114568
|
const cause = rebase.stderr || rebase.stdout || "Failed to rebase generated changes";
|