ci: should check the >>> master too (#6717)

.github/workflows/lint.yml

@@ -15,10 +15,10 @@ jobs:
           git grep --cached -l '' | xargs codespell --ignore-words=.ignore_words
       - name: Merge conflict
         run: |
-          grep "^<<<<<<< HEAD" $(git grep --cached -l '' | xargs) && exit 1 || true
+          bash ./utils/check-merge-conflict.sh
       - name: Plugin Code
         run: |
-          sudo bash ./utils/check-plugins-code.sh
+          bash ./utils/check-plugins-code.sh
 
   ci-eclint:
     runs-on: ubuntu-latest

utils/check-merge-conflict.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -euo pipefail
+
+grep "^<<<<<<< HEAD" $(git grep --cached -l '' | xargs) && exit 1
+grep "^>>>>>>> master" $(git grep --cached -l '' | xargs) && exit 1
+exit 0