diff --git a/go/libraries/doltcore/sqle/read_replica_database.go b/go/libraries/doltcore/sqle/read_replica_database.go index 461a95a913..4920bc65f7 100644 --- a/go/libraries/doltcore/sqle/read_replica_database.go +++ b/go/libraries/doltcore/sqle/read_replica_database.go @@ -406,7 +406,9 @@ OPTIMISTIC_RETRY: switch remoteRef.Ref.GetType() { case ref.BranchRefType: err := rrd.createNewBranchFromRemote(ctx, remoteRef, trackingRef) - if err != nil { + if errors.Is(err, datas.ErrOptimisticLockFailed) { + continue OPTIMISTIC_RETRY + } else if err != nil { return nil, err }