merge conflict

zacharysierakowski · zacharysierakowski · commit 19002c0405f9 · 2026-06-23T18:51:42.000Z
diff --git a/go/logic/migrator.go b/go/logic/migrator.go
@@ -1038,6 +1038,7 @@ func (mgtr *Migrator) resumeMoveTablesCutOverFromCheckpoint(chk *Checkpoint) err
 	}
 	atomic.StoreInt64(&mgtr.migrationContext.CutOverCompleteFlag, 1)
 	mgtr.migrationContext.Log.Debugf("T4: CutOverCompleteFlag set")
+	mgtr.migrationContext.MoveTables.DrainGTID = chk.MoveTablesCutOverDrainGTID
 	if err := mgtr.hooksExecutor.OnSuccess(false); err != nil {
 		return fmt.Errorf("on-success hook failed: %w", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -1038,6 +1038,7 @@ func (mgtr Migrator) resumeMoveTablesCutOverFromCheckpoint(chk Checkpoint) err`
`1038`	`1038`	`}`
`1039`	`1039`	`atomic.StoreInt64(&mgtr.migrationContext.CutOverCompleteFlag, 1)`
`1040`	`1040`	`mgtr.migrationContext.Log.Debugf("T4: CutOverCompleteFlag set")`
	`1041`	`+ mgtr.migrationContext.MoveTables.DrainGTID = chk.MoveTablesCutOverDrainGTID`
`1041`	`1042`	`if err := mgtr.hooksExecutor.OnSuccess(false); err != nil {`
`1042`	`1043`	`return fmt.Errorf("on-success hook failed: %w", err)`
`1043`	`1044`	`}`