starred/ProxmoxVE
1
0
Fork 0
mirror of https://github.com/community-scripts/ProxmoxVE.git synced 2026-02-05 00:29:55 +03:00
Code Issues 11 Packages Projects Releases 10 Wiki Activity

Homarr update script merge error #17

New Issue
Closed
opened 2026-02-04 16:18:48 +03:00 by OVERLORD · 9 comments
OVERLORD commented 2026-02-04 16:18:48 +03: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)"
OVERLORD added the bug label 2026-02-04 16:18:48 +03:00
OVERLORD commented 2026-02-04 16:18:51 +03:00
Author
Owner
Copy Link

@MickLesk commented on GitHub (Nov 7, 2024):

And what do you have updated in this File? 😅

@MickLesk commented on GitHub (Nov 7, 2024): And what do you have updated in this File? 😅
OVERLORD commented 2026-02-04 16:18:54 +03:00
Author
Owner
Copy Link

@Steefzar commented on GitHub (Nov 7, 2024):

And what do you have updated in this File? 😅

It seems to be all of my settings to Homarr, but how do I proceed? I can backup the file ofc but I want to update Homarr too
Forgive me if I sound stupid but it is not really clear to me what to do haha

@Steefzar commented on GitHub (Nov 7, 2024): > And what do you have updated in this File? 😅 It seems to be all of my settings to Homarr, but how do I proceed? I can backup the file ofc but I want to update Homarr too Forgive me if I sound stupid but it is not really clear to me what to do haha
OVERLORD commented 2026-02-04 16:19:01 +03:00
Author
Owner
Copy Link

@MickLesk commented on GitHub (Nov 8, 2024):

Done with the next homarr Update you run.

https://github.com/community-scripts/ProxmoxVE/pull/124

@MickLesk commented on GitHub (Nov 8, 2024): Done with the next homarr Update you run. https://github.com/community-scripts/ProxmoxVE/pull/124
OVERLORD commented 2026-02-04 16:19:03 +03:00
Author
Owner
Copy Link

@Narkowii commented on GitHub (Nov 8, 2024):

__ __ / / / /___ ____ ___ ____ ___________ / /_/ / __ \/ ____ / __ `/ / /
/ __ / // / / / / / / // / / / /
// //_// // //_,// //

Loading...
bash: -c: line 58: syntax error in conditional expression: unexpected token ;' root@homarr:~#

@Narkowii commented on GitHub (Nov 8, 2024): ` __ __ / / / /___ ____ ___ ____ ___________ / /_/ / __ \/ __ `__ \/ __ `/ ___/ ___/ / __ / /_/ / / / / / / /_/ / / / / /_/ /_/\____/_/ /_/ /_/\__,_/_/ /_/ Loading... bash: -c: line 58: syntax error in conditional expression: unexpected token `;' root@homarr:~# `
OVERLORD commented 2026-02-04 16:19:06 +03:00
Author
Owner
Copy Link

@MickLesk commented on GitHub (Nov 8, 2024):

__ __ / / / /___ ____ ___ ____ ___________ / /_/ / __ \/ ____ / __ `/ / /
/ __ / // / / / / / / // / / / /
// //_// // //_,// //

Loading...
bash: -c: line 58: syntax error in conditional expression: unexpected token ;' root@homarr:~#

Update or create?

@MickLesk commented on GitHub (Nov 8, 2024): > ` __ __ > / / / /___ ____ ___ ____ ___________ > / /_/ / __ \/ __ `__ \/ __ `/ ___/ ___/ > / __ / /_/ / / / / / / /_/ / / / / > /_/ /_/\____/_/ /_/ /_/\__,_/_/ /_/ > > Loading... > bash: -c: line 58: syntax error in conditional expression: unexpected token `;' > root@homarr:~# ` Update or create?
OVERLORD commented 2026-02-04 16:19:09 +03:00
Author
Owner
Copy Link

@Narkowii commented on GitHub (Nov 8, 2024):

oh sorry... for update with your modified script

@Narkowii commented on GitHub (Nov 8, 2024): oh sorry... for update with your modified script
OVERLORD commented 2026-02-04 16:19:14 +03:00
Author
Owner
Copy Link

@MickLesk commented on GitHub (Nov 8, 2024):

Check again

@MickLesk commented on GitHub (Nov 8, 2024): Check again
OVERLORD commented 2026-02-04 16:19:20 +03:00
Author
Owner
Copy Link

@Narkowii commented on GitHub (Nov 8, 2024):

`✓ Services Stopped
-mv: cannot move '/opt/data' to '/opt/homarr/data': Directory not empty

[ERROR] in line 77: exit code 0: while executing command mv /opt/data /opt/homarr/`

@Narkowii commented on GitHub (Nov 8, 2024): `✓ Services Stopped -mv: cannot move '/opt/data' to '/opt/homarr/data': Directory not empty [ERROR] in line 77: exit code 0: while executing command mv /opt/data /opt/homarr/`
OVERLORD commented 2026-02-04 16:19:23 +03:00
Author
Owner
Copy Link

@MickLesk commented on GitHub (Nov 8, 2024):

Wtf, I wonder why it works for me and not for you. Okay, then I have to add a workaround for general.

@MickLesk commented on GitHub (Nov 8, 2024): Wtf, I wonder why it works for me and not for you. Okay, then I have to add a workaround for general.
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
Implemented in VED waiting push to Main
breaking change
bug
bug
bugfix
deferred
delete script
dependencies
enhancement
external
feature
github
help wanted
in project pipeline
invalid
investigation
json
maintenance
needs triage
new script
new script
nice to have
not a script issue
not planned
organization
question
refactor
rename script
security
update script
website
wontdo
🛑 Failure to comply with the guidelines
No Label bug
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
OVERLORD
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: starred/ProxmoxVE#17
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?