@docupace/pipeline 1.0.81-alpha.5 → 1.0.81-alpha.7
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/package.json +1 -1
- package/src/merge/cli-merge.js +5 -11
package/package.json
CHANGED
package/src/merge/cli-merge.js
CHANGED
|
@@ -66,17 +66,6 @@ function attemptMerge(sourceBranch, targetBranch, verbose = false) {
|
|
|
66
66
|
console.log(`🔀 Merging ${sourceBranch} into current branch`);
|
|
67
67
|
}
|
|
68
68
|
|
|
69
|
-
// Fetch and pull the source branch
|
|
70
|
-
try {
|
|
71
|
-
execSync(`git fetch origin ${sourceBranch}`, {
|
|
72
|
-
stdio: verbose ? 'inherit' : 'pipe',
|
|
73
|
-
});
|
|
74
|
-
if (verbose) console.log(`📥 Fetched source branch: ${sourceBranch}`);
|
|
75
|
-
} catch (error) {
|
|
76
|
-
if (verbose)
|
|
77
|
-
console.log(`⚠️ Failed to fetch ${sourceBranch}: ${error.message}`);
|
|
78
|
-
}
|
|
79
|
-
|
|
80
69
|
try {
|
|
81
70
|
execSync(`git merge --no-commit --no-ff origin/${sourceBranch}`, {
|
|
82
71
|
stdio: 'pipe',
|
|
@@ -313,6 +302,11 @@ function checkForUncommittedChangesets(sourceBranch, verbose = false) {
|
|
|
313
302
|
|
|
314
303
|
try {
|
|
315
304
|
// Checkout source branch
|
|
305
|
+
|
|
306
|
+
execSync(`git fetch origin ${sourceBranch}`, {
|
|
307
|
+
stdio: verbose ? 'inherit' : 'pipe',
|
|
308
|
+
});
|
|
309
|
+
|
|
316
310
|
execSync(`git checkout ${sourceBranch}`, {
|
|
317
311
|
stdio: 'pipe',
|
|
318
312
|
});
|