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

Update develop from main #1696

Merged
merged 2 commits into from
Apr 10, 2024
Merged

Update develop from main #1696

merged 2 commits into from
Apr 10, 2024

Conversation

Kr0nox
Copy link
Member

@Kr0nox Kr0nox commented Apr 9, 2024

Updates develop from main after #1688

dependabot bot and others added 2 commits April 9, 2024 16:30
# Conflicts:
#	report-viewer/package-lock.json
#	report-viewer/package.json
@Kr0nox Kr0nox requested a review from tsaglam April 9, 2024 15:23
@tsaglam
Copy link
Member

tsaglam commented Apr 10, 2024

For some reason it shows 0 files changed in the PR summary. The PR branch has "vite": "^5.2.6". Probably a merging issue?

@Kr0nox
Copy link
Member Author

Kr0nox commented Apr 10, 2024

No, it is actually correct.
Develop is already on a never version of vite (5.2.6), while main just update to 5.1.7.
This means develop already has all the security updates main just got.
Merging develop into main, would still lead to merge conflicts, but since we dont need the vite update from main in develop for security reasons, I would leave it up to you whether we merge this now, or before the next release

@tsaglam
Copy link
Member

tsaglam commented Apr 10, 2024

Ah, I missed the minor number. I will merge nonetheless, hoping the dependabot commit is then no longer counted as commit behind main for develop.

@tsaglam tsaglam merged commit 54ab27d into develop Apr 10, 2024
8 checks passed
@tsaglam tsaglam deleted the update-dev branch April 10, 2024 06:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants