fix - removed package-lock.json from .gitignore #1397

New Issue

MrUnknownDE · 2026-04-05T19:20:13+02:00

MrUnknownDE commented

2026-04-05 19:20:13 +02:00

Originally created by @Lokowitz on 6/6/2025

Community Contribution License Agreement

By creating this pull request, I grant the project maintainers an unlimited,
perpetual license to use, modify, and redistribute these contributions under any terms they
choose, including both the AGPLv3 and the Fossorial Commercial license terms. I
represent that I have the right to grant this license for all contributed content.

Description

Removed package-lock.json from .gitignore because it is not recommended.
Recreated package-lock.json to avoid errors with dependabot because dependabot is not working properly without.

https://stackoverflow.com/questions/44206782/do-i-commit-the-package-lock-json-file-created-by-npm-5

I saw your merging conflict yesterday and i think this was the reason you added it to ignore?
I know the pain then updating deps and getting merging errors. Thats the reason i only update deps in the main branch and then merge it back to the other branches.

The problem you had was because i updated some deps in my PR against dev and you updated some deps at the same time in the main. If you still want to use dev as your main PR target i think you should update the deps directly into dev or into main and then merge it directly back to dev.

Have a nice day,
Marvin

*Originally created by @Lokowitz on 6/6/2025* ## Community Contribution License Agreement By creating this pull request, I grant the project maintainers an unlimited, perpetual license to use, modify, and redistribute these contributions under any terms they choose, including both the AGPLv3 and the Fossorial Commercial license terms. I represent that I have the right to grant this license for all contributed content. ## Description Removed package-lock.json from .gitignore because it is not recommended. Recreated package-lock.json to avoid errors with dependabot because dependabot is not working properly without. https://stackoverflow.com/questions/44206782/do-i-commit-the-package-lock-json-file-created-by-npm-5 I saw your merging conflict yesterday and i think this was the reason you added it to ignore? I know the pain then updating deps and getting merging errors. Thats the reason i only update deps in the main branch and then merge it back to the other branches. The problem you had was because i updated some deps in my PR against `dev` and you updated some deps at the same time in the `main`. If you still want to use `dev` as your main PR target i think you should update the deps directly into `dev` or into `main` and then merge it directly back to `dev`. Have a nice day, Marvin

MrUnknownDE closed this issue

2026-04-05 19:20:13 +02:00

Sign in to join this conversation.

Branches Tags

main

dev

dependabot/npm_and_yarn/dev-minor-updates-b4e5d6b9c5

revert-2766-feature/systemd-install-instructions

dependabot/npm_and_yarn/prod-patch-updates-05702d39f2

dependabot/npm_and_yarn/next-16.2.1

dependabot/npm_and_yarn/recharts-3.8.1

alerting-rules

private-site-ha

dependabot/docker/docker/library/node-25-slim

ssh

delete-account

msg-delivery

org-only-idp

cicd

patch

site-targets-auto-login

No Label

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: github/pangolin#1397