969
continue
970
}
972
>
// targetBranchUpdateRegistry is a nil in a Reset case, and not nil in a conflict resolution case.
973
>
// If the Update with the same UpdateId is already present in the target branch (Find returns non-nil),
974
>
// it is skipped and not reapplied.
975
>
if targetBranchUpdateRegistry != nil && targetBranchUpdateRegistry.Find(ctx, attr.Request.Meta.UpdateId) != nil {
976
continue
977
}
979
>
attr.GetRequest(),
980
>
attr.Origin,
981
>
); err != nil {
982
return reappliedEvents, err
983
}
985
case enumspb.EVENT_TYPE_WORKFLOW_EXECUTION_UPDATE_ACCEPTED:
986
if excludeUpdate || isDuplicate(event) {
987
continue
988
}
990
>
// targetBranchUpdateRegistry is a nil in a Reset case, and not nil in a conflict resolution case.
991
>
// If the Update with the same UpdateId is already present in the target branch (Find returns non-nil),
992
>
// it is skipped and not reapplied.
993
>
if targetBranchUpdateRegistry != nil && targetBranchUpdateRegistry.Find(ctx, attr.ProtocolInstanceId) != nil {
994
continue
995
}
997
>
if request == nil {
998
// An UpdateAccepted event lacks a request payload if and only if it is preceded by an UpdateAdmitted
999
// event (these always have the payload). If an UpdateAccepted event has no preceding UpdateAdmitted