resolve conflicts

Signed-off-by: Neil Shen <overvenus@gmail.com>

.golangci.yml

@@ -2,36 +2,9 @@ linters:
   enable:
     - unconvert
     - unparam
-<<<<<<< HEAD
-=======
-    - revive
     - depguard
 
 linters-settings:
-  revive:
-    ignore-generated-header: false
-    severity: error
-    confidence: 0.8
-    error-code: -1
-    warning-code: -1
-    rules:
-      - name: blank-imports
-      - name: context-as-argument
-      - name: dot-imports
-      - name: error-return
-      - name: error-strings
-      - name: error-naming
-      - name: exported
-      - name: if-return
-      - name: var-naming
-      - name: package-comments
-      - name: range
-      - name: receiver-naming
-      - name: indent-error-flow
-      - name: superfluous-else
-      - name: modifies-parameter
-      - name: unreachable-code
-
   depguard:
     list-type: blacklist
     include-go-root: false
@@ -42,4 +15,3 @@ linters-settings:
       # specify an error message to output when a blacklisted package is used
       - log: "logging is allowed only by pingcap/log"
       - github.com/juju/errors: "error handling is allowed only by pingcap/errors"
->>>>>>> 2ed02366d (pkg,cdc: do not use log package (#3902))

cdc/processor/pipeline/mounter.go

@@ -15,12 +15,12 @@ package pipeline
 
 import (
 	"context"
-	"log"
 	"sync"
 	"time"
 
 	"github.com/edwingeng/deque"
 	"github.com/pingcap/failpoint"
+	"github.com/pingcap/log"
 	"github.com/pingcap/ticdc/cdc/model"
 	"github.com/pingcap/ticdc/pkg/notify"
 	"github.com/pingcap/ticdc/pkg/pipeline"

cdc/sink/codec/canal.go

@@ -20,13 +20,10 @@ import (
 
 	"github.com/golang/protobuf/proto" // nolint:staticcheck
 	"github.com/pingcap/errors"
-<<<<<<< HEAD
+	"github.com/pingcap/log"
 	mm "github.com/pingcap/parser/model"
 	"github.com/pingcap/parser/mysql"
 	parser_types "github.com/pingcap/parser/types"
-=======
-	"github.com/pingcap/log"
->>>>>>> 2ed02366d (pkg,cdc: do not use log package (#3902))
 	"github.com/pingcap/ticdc/cdc/model"
 	cerror "github.com/pingcap/ticdc/pkg/errors"
 	canal "github.com/pingcap/ticdc/proto/canal"

integration/tests/case_date_time.go

@@ -17,18 +17,11 @@ import (
 	"errors"
 	"time"
 
-<<<<<<< HEAD:integration/tests/case_date_time.go
+	"github.com/pingcap/log"
 	"github.com/pingcap/ticdc/integration/framework"
 	"github.com/pingcap/ticdc/integration/framework/avro"
 	"github.com/pingcap/ticdc/integration/framework/canal"
 	"github.com/pingcap/ticdc/integration/framework/mysql"
-=======
-	"github.com/pingcap/log"
-	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework"
-	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework/avro"
-	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework/canal"
-	"github.com/pingcap/ticdc/tests/mq_protocol_tests/framework/mysql"
->>>>>>> 2ed02366d (pkg,cdc: do not use log package (#3902)):tests/mq_protocol_tests/cases/case_date_time.go
 )
 
 // DateTimeCase is base impl of test case for different types data

pkg/context/context.go

@@ -17,17 +17,12 @@ import (
 	"context"
 	"time"
 
-<<<<<<< HEAD
-	"github.com/pingcap/ticdc/pkg/pdtime"
-
-	"github.com/pingcap/ticdc/pkg/version"
-
-=======
 	"github.com/pingcap/log"
->>>>>>> 2ed02366d (pkg,cdc: do not use log package (#3902))
 	"github.com/pingcap/ticdc/cdc/kv"
 	"github.com/pingcap/ticdc/cdc/model"
 	"github.com/pingcap/ticdc/pkg/config"
+	"github.com/pingcap/ticdc/pkg/pdtime"
+	"github.com/pingcap/ticdc/pkg/version"
 	tidbkv "github.com/pingcap/tidb/kv"
 	"github.com/tikv/client-go/v2/oracle"
 	pd "github.com/tikv/pd/client"

pkg/context/context_test.go

@@ -136,11 +136,7 @@ func (s *contextSuite) TestThrowPanic(c *check.C) {
 	defer testleak.AfterTest(c)()
 	defer func() {
 		panicMsg := recover()
-<<<<<<< HEAD
-		c.Assert(panicMsg, check.Equals, "an error has escaped, please report a bug{error 26 0  mock error}")
-=======
-		require.Equal(t, panicMsg, "an error has escaped, please report a bug")
->>>>>>> 2ed02366d (pkg,cdc: do not use log package (#3902))
+		c.Assert(panicMsg, check.Equals, "an error has escaped, please report a bug")
 	}()
 	stdCtx := context.Background()
 	ctx := NewContext(stdCtx, &GlobalVars{})