Skip to content
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.

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

[Snyk] Upgrade eslint-plugin-react from 7.37.2 to 7.37.3 #1907

Closed
wants to merge 10 commits into from
Prev Previous commit
Next Next commit
Update global-npm-resolve-conflicting-files-fix.yml
  • Loading branch information
qdraw authored Jan 15, 2025
commit ff87ea36b5890cd46f8ff177d256af375816ef40
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,16 @@ jobs:
- name: Resolve package-lock.json conflicts
run: |
for project in ${{ steps.define-projects.outputs.projects }}; do
git diff --exit-code $project/package-lock.json > /dev/null || (
echo "Checking for conflicts in $project/package-lock.json"
if ! git diff --exit-code $project/package-lock.json > /dev/null; then
echo "Conflicts detected in $project/package-lock.json"
git checkout --theirs $project/package-lock.json
npm install --prefix $project
git add $project/package-lock.json
)
echo "Conflicts resolved and changes added for $project/package-lock.json"
else
echo "No conflicts detected in $project/package-lock.json"
fi
done
git diff-index --quiet HEAD || git commit -m "Resolve package-lock.json conflicts"

Expand Down
Loading