memos update fails

[jsapede]

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

[MickLesk]

can you execute:
git diff

[jsapede]

where ? in /opt/memos folder ?

[jsapede]

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]

no ideas ?

[MickLesk]

Not yet maybe next week.

[jsapede]

was only to knwo if you need additionnal infos
no emergency

[MickLesk]

fixed with: #1207

can you check?