Skip to content

Commit 324b739

Browse files
committed
Updated comments
1 parent ff50b40 commit 324b739

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

core/backend/src/BriefcaseManager.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -879,7 +879,9 @@ export class BriefcaseManager {
879879
IModelJsFs.writeFileSync(filePath, "[");
880880
let isFirst = true;
881881
for (const instancePatch of instancePatches) {
882-
if (instancePatch.$meta.op === "Updated" && instancePatch.$meta.stage === "Old") continue; // we will not take the old stage of updated instances
882+
// we will not take the old stage of updated instances for now, because we still don't have conflict resolution on instance level while using semantic rebase.
883+
// Once we have conflict resolution on instance level, we can consider taking old stage of updated instances as well.
884+
if (instancePatch.$meta.op === "Updated" && instancePatch.$meta.stage === "Old") continue;
883885
IModelJsFs.appendFileSync(filePath, `${isFirst ? "" : ","}\n${JSON.stringify(instancePatch, Base64EncodedString.replacer)}`);
884886
isFirst = false;
885887
}

0 commit comments

Comments
 (0)