@docupace/pipeline 1.0.65-alpha.0 → 1.0.65-alpha.2

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.
Files changed (2) hide show
  1. package/package.json +1 -1
  2. package/src/merge/cli-resolve.js +1 -6
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@docupace/pipeline",
3
- "version": "1.0.65-alpha.0",
3
+ "version": "1.0.65-alpha.2",
4
4
  "main": "index.js",
5
5
  "type": "module",
6
6
  "bin": {
package/src/merge/cli-resolve.js CHANGED
@@ -238,7 +238,7 @@ export async function autoResolveConflicts(options = {}) {
238
238
  try {
239
239
  if (verbose)
240
240
  console.log(`🔧 Applying '${strategy}' strategy to ${filePath}`);
241
- const result = mergeFunction(filePath);
241
+ const result = await mergeFunction(filePath);
242
242
  if (result.success) {
243
243
  resolvedCount++;
244
244
  } else {
@@ -397,8 +397,3 @@ export function setupResolve(program) {
397
397
  }
398
398
  });
399
399
  }
400
-
401
- process.chdir(
402
- '/Users/fielm/Documents/Docupace/GraphQL/docupace-graphql-server',
403
- );
404
- autoResolveConflicts({ verbose: true });