improve concurrent run handling

Author: linkdata

action.yml

@@ -318,7 +318,7 @@ runs:
             max_attempts=5
             attempt=1
             while true; do
-              if git push --force-with-lease=coverage origin HEAD:coverage; then
+              if git push origin HEAD:coverage; then
                 break
               fi
 
@@ -327,8 +327,14 @@ runs:
                 exit 1
               fi
 
-              echo "Push rejected (attempt ${attempt}/${max_attempts}). Refreshing coverage branch..."
-              git fetch origin coverage
+              echo "Push rejected (attempt ${attempt}/${max_attempts}). Rebasing onto latest origin/coverage..."
+              git fetch origin +refs/heads/coverage:refs/remotes/origin/coverage
+              # Prefer this run's regenerated files if both runs touched the same paths.
+              if ! git rebase -X theirs refs/remotes/origin/coverage; then
+                git rebase --abort || true
+                echo "Automatic rebase failed due to conflicts in coverage branch updates." >&2
+                exit 1
+              fi
               attempt=$(( attempt + 1 ))
             done
           else