Update stream.go

pingcap · Nov 20, 2023 · 8074858 · 8074858
1 parent 83ccd96
commit 8074858
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/br/pkg/task/stream.go b/br/pkg/task/stream.go
@@ -1056,9 +1056,6 @@ func checkTaskExists(ctx context.Context, cfg *RestoreConfig) error {
 		return err
 	}
 	if len(tasks) > 0 {
-<<<<<<< HEAD
-		return errors.Errorf("log backup task is running: %s, please stop the task before restore, and after PITR operation finished, create log-backup task again and create a full backup on this cluster", tasks[0].Info.Name)
-=======
 		return errors.Errorf("log backup task is running: %s, "+
 			"please stop the task before restore, and after PITR operation finished, "+
 			"create log-backup task again and create a full backup on this cluster", tasks[0].Info.Name)
@@ -1073,7 +1070,6 @@ func checkTaskExists(ctx context.Context, cfg *RestoreConfig) error {
 		if !nameSet.Empty() {
 			return errors.Errorf("%splease stop changefeed(s) before restore", nameSet.MessageToUser())
 		}
->>>>>>> 95378e5bede (br: check the correct changefeed info when restore/import data (#47322))
 	}
 	return nil
 }