@regressionproof/snapshotter 0.5.5 → 0.5.6
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/build/esm/git.js +1 -1
- package/build/git.js +1 -1
- package/package.json +2 -2
package/build/esm/git.js
CHANGED
|
@@ -53,7 +53,7 @@ function pullFromRemote(mirrorPath, log) {
|
|
|
53
53
|
const branch = yield getCurrentBranch(mirrorPath);
|
|
54
54
|
const remoteBranchExists = yield checkRemoteBranchExists(mirrorPath, branch);
|
|
55
55
|
if (remoteBranchExists) {
|
|
56
|
-
yield execOrThrow(`git -C "${mirrorPath}" rebase origin/${branch}`, log);
|
|
56
|
+
yield execOrThrow(`git -C "${mirrorPath}" rebase -X theirs origin/${branch}`, log);
|
|
57
57
|
}
|
|
58
58
|
});
|
|
59
59
|
}
|
package/build/git.js
CHANGED
|
@@ -46,7 +46,7 @@ async function pullFromRemote(mirrorPath, log) {
|
|
|
46
46
|
const branch = await getCurrentBranch(mirrorPath);
|
|
47
47
|
const remoteBranchExists = await checkRemoteBranchExists(mirrorPath, branch);
|
|
48
48
|
if (remoteBranchExists) {
|
|
49
|
-
await execOrThrow(`git -C "${mirrorPath}" rebase origin/${branch}`, log);
|
|
49
|
+
await execOrThrow(`git -C "${mirrorPath}" rebase -X theirs origin/${branch}`, log);
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
async function getCurrentBranch(mirrorPath) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@regressionproof/snapshotter",
|
|
3
|
-
"version": "0.5.
|
|
3
|
+
"version": "0.5.6",
|
|
4
4
|
"publishConfig": {
|
|
5
5
|
"access": "public"
|
|
6
6
|
},
|
|
@@ -94,5 +94,5 @@
|
|
|
94
94
|
"@sprucelabs/spruce-core-schemas": "^42.1.3",
|
|
95
95
|
"@sprucelabs/spruce-skill-utils": "^34.0.3"
|
|
96
96
|
},
|
|
97
|
-
"gitHead": "
|
|
97
|
+
"gitHead": "88d242a7078bcc4222757701713e96116fab97db"
|
|
98
98
|
}
|