github-starred/pangolin
2
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-05-07 13:19:07 -05:00
Code Issues 564 Packages Projects Releases 72 Wiki Activity

[PR #855] [MERGED] fix - removed package-lock.json from .gitignore #5228

New Issue
Closed
opened 2026-04-23 02:26:16 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-23 02:26:16 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/fosrl/pangolin/pull/855
Author: @Lokowitz
Created: 6/6/2025
Status: ✅ Merged
Merged: 6/6/2025
Merged by: @oschwartz10612

Base: main ← Head: main

📝 Commits (1)

  • 553dffd removed package-lock.json from .gitignore

📊 Changes

2 files changed (+13791 additions, -13792 deletions)

View changed files

📝 .gitignore (+1 -2)
📝 package-lock.json (+13790 -13790)

📄 Description

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

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/fosrl/pangolin/pull/855 **Author:** [@Lokowitz](https://github.com/Lokowitz) **Created:** 6/6/2025 **Status:** ✅ Merged **Merged:** 6/6/2025 **Merged by:** [@oschwartz10612](https://github.com/oschwartz10612) **Base:** `main` ← **Head:** `main` --- ### 📝 Commits (1) - [`553dffd`](https://github.com/fosrl/pangolin/commit/553dffd4eea5ee14df6cd95f9b66a6c113d965b5) removed package-lock.json from .gitignore ### 📊 Changes **2 files changed** (+13791 additions, -13792 deletions) <details> <summary>View changed files</summary> 📝 `.gitignore` (+1 -2) 📝 `package-lock.json` (+13790 -13790) </details> ### 📄 Description ## 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 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-04-23 02:26:17 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
api
authentication
bug
config
dependencies
docker
documentation
enhancement
good first issue
help wanted
Improvement
Look Into
needs investigating
networking
new feature
non-critical bug
potential bug
pull-request
Mirrored from GitHub Pull Request
 question
reverse proxy
Security
stale
ui
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/pangolin#5228
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?