fix: Revert "feat: add label in case of conflict (ti-community-infra#652

)"

This reverts commit a168b92

Signed-off-by: hi-rustin <[email protected]>

internal/pkg/externalplugins/cherrypicker/cherrypicker.go

@@ -561,11 +561,9 @@ func (s *Server) handle(logger *logrus.Entry, requestor string,
 
 	// Title for GitHub issue/PR.
 	title = fmt.Sprintf("%s (#%d)", title, num)
-	hasConflicts := false
 
 	// Try git am --3way localPath.
 	if err := r.Am(localPath); err != nil {
-		hasConflicts = true
 		var errs []error
 		logger.WithError(err).Warnf("Failed to apply #%d on top of target branch %q.", num, targetBranch)
 		if opts.IssueOnConflict {
@@ -680,11 +678,6 @@ func (s *Server) handle(logger *logrus.Entry, requestor string,
 		labels.Insert(pickedLabel)
 	}
 
-	// Add conflicts label.
-	if hasConflicts {
-		labels.Insert(tiexternalplugins.CherryPickHasConflicts)
-	}
-
 	if err := s.GitHubClient.AddLabels(org, repo, createdNum, labels.List()...); err != nil {
 		logger.WithError(err).Warnf("Failed to add labels %v", labels.List())
 	}

internal/pkg/externalplugins/label.go

@@ -5,8 +5,6 @@ import "fmt"
 const (
 	// CanMergeLabel is the name of the merge label applied by the merge plugin.
 	CanMergeLabel = "status/can-merge"
-	// CherryPickHasConflicts is the name of the conflicts label applied by the cherry-pick plugin.
-	CherryPickHasConflicts = "status/cherry-pick-has-conflicts"
 )
 
 const (