Skip to content

checkout: fix git config for merging #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asmorkalov merged 1 commit into from
Sep 17, 2026
Merged

checkout: fix git config for merging #349

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions checkout-and-merge/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
Loading