[CI] Do a rebase pull when updating the repo cache (#18523)

We don't want to try to make a merge commit.

Signed-off-by: Sarnie, Nick <[email protected]>

Author: sarnex

devops/actions/cached_checkout/action.yml

@@ -31,7 +31,7 @@ runs:
       mkdir -p ${{ inputs.cache_path }}/${{ inputs.repository }}
       cd ${{ inputs.cache_path }}/${{ inputs.repository }}
       if [ -d ./.git ]; then
-        git pull --prune
+        git pull --prune --rebase
       else
         git clone https://github.com/${{ inputs.repository }}.git .
         git gc