Merge pull request #36 from jhudsl/cansavvy-patch-1

Add rebase for checks

.github/workflows/report-maker.yml

@@ -149,7 +149,7 @@ jobs:
 
         git add ${{ steps.check_results.outputs.report_path }} --force || echo "No changes to commit"
         git commit -m 'Add check file' || echo "No changes to commit"
-        git pull
+        git pull --rebase --set-upstream origin $branch_name --allow-unrelated-histories --strategy-option=ours
         git merge origin/${{ github.head_ref }} --allow-unrelated-histories --strategy-option ours
         git push origin $branch_name --force || echo "No changes to commit"