@ricsam/r5d-api 0.0.82 → 0.0.86

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.
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@ricsam/r5d-api",
3
- "version": "0.0.82",
3
+ "version": "0.0.86",
4
4
  "type": "commonjs"
5
5
  }
@@ -1,5 +1,5 @@
1
1
  {
2
2
  "name": "@ricsam/r5d-api",
3
- "version": "0.0.82",
3
+ "version": "0.0.86",
4
4
  "type": "module"
5
5
  }
@@ -349,11 +349,13 @@ export type R5dctlWorkspaceSyncResult = {
349
349
  gitStatus: string;
350
350
  affectedProjects: string[];
351
351
  affectedPaths: string[];
352
+ conflictKind?: "integration_rebase" | "projection_merge";
352
353
  conflictPaths?: string[];
353
354
  conflictSnapshotRefs?: {
354
355
  local: string;
355
356
  remote: string;
356
357
  };
358
+ verifiedAncestorHeads?: string[];
357
359
  discardedPaths: string[];
358
360
  localChangesDiscarded: boolean;
359
361
  dirtyGeneration?: number;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ricsam/r5d-api",
3
- "version": "0.0.82",
3
+ "version": "0.0.86",
4
4
  "type": "module",
5
5
  "main": "./dist/cjs/index.cjs",
6
6
  "module": "./dist/mjs/index.mjs",