diff --git a/checkout-and-merge/action.yaml b/checkout-and-merge/action.yaml index abae03f9..4bc0e279 100644 --- a/checkout-and-merge/action.yaml +++ b/checkout-and-merge/action.yaml @@ -48,6 +48,7 @@ runs: cd opencv git config user.email "opencv.ci" git config user.name "opencv.ci" + git config pull.rebase false echo "::endgroup::" - if: ${{ github.event.repository.name != 'ci-gha-workflow' && contains(inputs.repos, 'main') && inputs.source_branch }} @@ -80,6 +81,7 @@ runs: cd opencv_contrib git config user.email "opencv.ci" git config user.name "opencv.ci" + git config pull.rebase false echo "::endgroup::" - if: ${{ github.event.repository.name != 'ci-gha-workflow' && contains(inputs.repos, 'contrib') && inputs.source_branch }} @@ -112,6 +114,7 @@ runs: cd opencv_extra git config user.email "opencv.ci" git config user.name "opencv.ci" + git config pull.rebase false echo "::endgroup::" - if: ${{ github.event.repository.name != 'ci-gha-workflow' && contains(inputs.repos, 'extra') && inputs.source_branch }}