SVI/ProxmoxVE
1
0
Fork 0
mirror of https://github.com/community-scripts/ProxmoxVE.git synced 2026-07-28 08:42:37 -04:00
Code Issues 2.6k Packages Projects Releases 10 Wiki Activity

memos update fails #173

New Issue
Closed
opened 2025-11-20 04:44:32 -05:00 by saavagebueno · 7 comments
saavagebueno commented 2025-11-20 04:44:32 -05:00
Owner
Copy Link

Originally created by @jsapede on GitHub (Dec 10, 2024).

Please verify that you have read and understood the guidelines.

yes

A clear and concise description of the issue.

launching update scirpt fails

What settings are you currently utilizing?

  • Default Settings
  • Advanced Settings

Which Linux distribution are you employing?

Debian 12

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

 /error: Your local changes to the following files would be overwritten by merge:
        proto/gen/api/v1/activity_service.pb.gw.go
        proto/gen/api/v1/auth_service.pb.gw.go
        proto/gen/api/v1/idp_service.pb.gw.go
        proto/gen/api/v1/inbox_service.pb.gw.go
        proto/gen/api/v1/markdown_service.pb.gw.go
        proto/gen/api/v1/memo_service.pb.gw.go
        proto/gen/api/v1/resource_service.pb.gw.go
        proto/gen/api/v1/user_service.pb.gw.go
        proto/gen/api/v1/webhook_service.pb.gw.go
        proto/gen/api/v1/workspace_service.pb.gw.go
        proto/gen/api/v1/workspace_setting_service.pb.gw.go
Please commit your changes or stash them before you merge.
Aborting

[ERROR] in line 63: exit code 0: while executing command output=$(git pull --no-rebase)
 '''

### Please provide detailed steps to reproduce the issue.

lauchend update command
Originally created by @jsapede on GitHub (Dec 10, 2024). ### Please verify that you have read and understood the guidelines. yes ### A clear and concise description of the issue. launching update scirpt fails ### What settings are you currently utilizing? - [X] Default Settings - [ ] Advanced Settings ### Which Linux distribution are you employing? Debian 12 ### If relevant, including screenshots or a code block can be helpful in clarifying the issue. ``` /error: Your local changes to the following files would be overwritten by merge: proto/gen/api/v1/activity_service.pb.gw.go proto/gen/api/v1/auth_service.pb.gw.go proto/gen/api/v1/idp_service.pb.gw.go proto/gen/api/v1/inbox_service.pb.gw.go proto/gen/api/v1/markdown_service.pb.gw.go proto/gen/api/v1/memo_service.pb.gw.go proto/gen/api/v1/resource_service.pb.gw.go proto/gen/api/v1/user_service.pb.gw.go proto/gen/api/v1/webhook_service.pb.gw.go proto/gen/api/v1/workspace_service.pb.gw.go proto/gen/api/v1/workspace_setting_service.pb.gw.go Please commit your changes or stash them before you merge. Aborting [ERROR] in line 63: exit code 0: while executing command output=$(git pull --no-rebase) ''' ### Please provide detailed steps to reproduce the issue. lauchend update command
saavagebueno added the questionbug labels 2025-11-20 04:44:32 -05:00
saavagebueno commented 2025-11-20 04:44:33 -05:00
Author
Owner
Copy Link

@MickLesk commented on GitHub (Dec 13, 2024):

can you execute:
git diff

@MickLesk commented on GitHub (Dec 13, 2024): can you execute: git diff
saavagebueno commented 2025-11-20 04:44:33 -05:00
Author
Owner
Copy Link

@jsapede commented on GitHub (Dec 13, 2024):

where ? in /opt/memos folder ?

@jsapede commented on GitHub (Dec 13, 2024): where ? in /opt/memos folder ?
saavagebueno commented 2025-11-20 04:44:33 -05:00
Author
Owner
Copy Link

@jsapede commented on GitHub (Dec 13, 2024):

diff --git a/proto/gen/api/v1/activity_service.pb.gw.go b/proto/gen/api/v1/activity_service.pb.gw.go
index 0f0cf571..9c61fc17 100644
--- a/proto/gen/api/v1/activity_service.pb.gw.go
+++ b/proto/gen/api/v1/activity_service.pb.gw.go
@@ -10,6 +10,7 @@ package apiv1
 
 import (
        "context"
+       "errors"
        "io"
        "net/http"
 
@@ -24,63 +25,50 @@ import (
 )
 
 // Suppress "imported and not used" errors
-var _ codes.Code
-var _ io.Reader
-var _ status.Status
-var _ = runtime.String
-var _ = utilities.NewDoubleArray
-var _ = metadata.Join
+var (
+       _ codes.Code
+       _ io.Reader
+       _ status.Status
+       _ = errors.New
+       _ = runtime.String
+       _ = utilities.NewDoubleArray
+       _ = metadata.Join
+)
 
 func request_ActivityService_GetActivity_0(ctx context.Context, marshaler runtime.Marshaler, client ActivityServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
-       var protoReq GetActivityRequest
:

and many more messages

@jsapede commented on GitHub (Dec 13, 2024): ``` diff --git a/proto/gen/api/v1/activity_service.pb.gw.go b/proto/gen/api/v1/activity_service.pb.gw.go index 0f0cf571..9c61fc17 100644 --- a/proto/gen/api/v1/activity_service.pb.gw.go +++ b/proto/gen/api/v1/activity_service.pb.gw.go @@ -10,6 +10,7 @@ package apiv1 import ( "context" + "errors" "io" "net/http" @@ -24,63 +25,50 @@ import ( ) // Suppress "imported and not used" errors -var _ codes.Code -var _ io.Reader -var _ status.Status -var _ = runtime.String -var _ = utilities.NewDoubleArray -var _ = metadata.Join +var ( + _ codes.Code + _ io.Reader + _ status.Status + _ = errors.New + _ = runtime.String + _ = utilities.NewDoubleArray + _ = metadata.Join +) func request_ActivityService_GetActivity_0(ctx context.Context, marshaler runtime.Marshaler, client ActivityServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq GetActivityRequest : ``` and many more messages
saavagebueno commented 2025-11-20 04:44:33 -05:00
Author
Owner
Copy Link

@jsapede commented on GitHub (Dec 30, 2024):

no ideas ?

@jsapede commented on GitHub (Dec 30, 2024): no ideas ?
saavagebueno commented 2025-11-20 04:44:34 -05:00
Author
Owner
Copy Link

@MickLesk commented on GitHub (Dec 30, 2024):

Not yet maybe next week.

@MickLesk commented on GitHub (Dec 30, 2024): Not yet maybe next week.
saavagebueno commented 2025-11-20 04:44:34 -05:00
Author
Owner
Copy Link

@jsapede commented on GitHub (Dec 31, 2024):

was only to knwo if you need additionnal infos
no emergency

@jsapede commented on GitHub (Dec 31, 2024): was only to knwo if you need additionnal infos no emergency
saavagebueno commented 2025-11-20 04:44:34 -05:00
Author
Owner
Copy Link

@MickLesk commented on GitHub (Jan 3, 2025):

fixed with: https://github.com/community-scripts/ProxmoxVE/pull/1207

can you check?

@MickLesk commented on GitHub (Jan 3, 2025): fixed with: https://github.com/community-scripts/ProxmoxVE/pull/1207 can you check?
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 question
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#173
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?