@ricsam/r5d-api 0.0.82 → 0.0.83
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/cjs/package.json +1 -1
- package/dist/mjs/package.json +1 -1
- package/dist/types/index.d.ts +2 -0
- package/package.json +1 -1
package/dist/cjs/package.json
CHANGED
package/dist/mjs/package.json
CHANGED
package/dist/types/index.d.ts
CHANGED
|
@@ -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;
|