With gitv2.26, git rebase uses "git merge" mechanism instead of "git apply". This creates a rebase-merge folder in .git, in case of rebase conflict. This caused problems in self hosted runners due to old rebase-merge folder. This commit deletes this folder before git rebase action. Signed-off-by: Mert Ekren <mert.ekren@analog.com> |
||
|---|---|---|
| .. | ||
| ISSUE_TEMPLATE | ||
| workflows | ||
| license_config.yml | ||
| SECURITY.md | ||