github.com/pingcap/tiflow@v0.0.0-20240520035814-5bf52d54e205/scripts/check-merge-conflicts.sh (about)

     1  # Copyright 2021 PingCAP, Inc.
     2  #
     3  # Licensed under the Apache License, Version 2.0 (the "License");
     4  # you may not use this file except in compliance with the License.
     5  # You may obtain a copy of the License at
     6  #
     7  #     http://www.apache.org/licenses/LICENSE-2.0
     8  #
     9  # Unless required by applicable law or agreed to in writing, software
    10  # distributed under the License is distributed on an "AS IS" BASIS,
    11  # See the License for the specific language governing permissions and
    12  # limitations under the License.
    13  
    14  ! git --no-pager grep -E '^<<<<<<< '