SVI/ProxmoxVE
1
0
Fork 0
mirror of https://github.com/community-scripts/ProxmoxVE.git synced 2026-03-31 06:34:17 -04:00
Code Issues 2.6k Packages Projects Releases 10 Wiki Activity

Homarr update script merge error #16

New Issue
Open
opened 2025-11-20 04:42:34 -05:00 by saavagebueno · 0 comments
saavagebueno commented 2025-11-20 04:42:34 -05:00
Owner
Copy Link

Originally created by @Steefzar on GitHub (Nov 7, 2024).

Originally assigned to: @MickLesk on GitHub.

Please verify that you have read and understood the guidelines.

yes

A clear and concise description of the issue.

Getting this when I am using the update script for the Homarr LXC:

/Updating 68ff84c8..95c126f2
error: Your local changes to the following files would be overwritten by merge:
data/configs/default.json
Please commit your changes or stash them before you merge.
Aborting
Already up to date.

New to committing so forgive me if I am not doing it correctly.

What settings are you currently utilizing?

Default Settings

Which Linux distribution are you employing?

Debian 12

If relevant, including screenshots or a code block can be helpful in clarifying the issue.

Skärmbild_20241107_155835

Please provide detailed steps to reproduce the issue.

Run update script inside the Homarr LXC:
bash -c "$(wget -qLO - https://github.com/community-scripts/ProxmoxVE/raw/main/ct/homarr.sh)"

Originally created by @Steefzar on GitHub (Nov 7, 2024). Originally assigned to: @MickLesk on GitHub. ### Please verify that you have read and understood the guidelines. yes ### A clear and concise description of the issue. Getting this when I am using the update script for the Homarr LXC: **/Updating 68ff84c8..95c126f2 error: Your local changes to the following files would be overwritten by merge: data/configs/default.json Please commit your changes or stash them before you merge. Aborting Already up to date.** New to committing so forgive me if I am not doing it correctly. ### What settings are you currently utilizing? Default Settings ### Which Linux distribution are you employing? Debian 12 ### If relevant, including screenshots or a code block can be helpful in clarifying the issue. ![Skärmbild_20241107_155835](https://github.com/user-attachments/assets/2e57a5bd-8a9a-4337-8341-93f309db45eb) ### Please provide detailed steps to reproduce the issue. Run update script inside the Homarr LXC: bash -c "$(wget -qLO - https://github.com/community-scripts/ProxmoxVE/raw/main/ct/homarr.sh)"
saavagebueno added the bug label 2025-11-20 04:42:34 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
🛑 Failure to comply with the guidelines
breaking change
bug
bug
bugfix
deferred
delete script
dependencies
enhancement
external
feature
github
help wanted
Implemented in VED waiting push to Main
in project pipeline
invalid
investigation
json
maintenance
new script
new script
nice to have
not a script issue
not planned
organization
pull-request
Mirrored from GitHub Pull Request
 question
refactor
rename script
security
update script
website
wontdo
No Label bug
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
saavagebueno
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: SVI/ProxmoxVE#16
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?