"Repository Maintenance" when having conflicts

[MaximeDametis]

Describe the issue

My weblate repository can not rebase due to conflicts.
I then wanted to fix the conflicts locally and then push on the weblate repository, I find out that pushing on the weblate repository was not supported, but pushing on the upstream repo could fix. Problem is that I don't want to push on my upstream repo to keep it clean.
So the best solution in my mind was to "Reset and Reapply", resetting with the upstream repo and reapply translations, seems perfect for me.
But when I click on the button the request is just pending until my proxy returns a gateway timeout.
In my logs I can see
weblate-1 | 192.168.94.204 - - [18/Nov/2025:13:18:04 +0000] "POST /reset/myProject/ HTTP/1.1" 499 0 "https://weblate.mydomain.com/" "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/142.0.0.0 Safari/537.36" weblate-1 | 127.0.0.1 - - [18/Nov/2025:13:18:16 +0000] "GET /healthz/ HTTP/1.1" 200 12 "-" "curl/8.12.1" weblate-1 | [2025-11-18 14:19:02,629: INFO/MainProcess] Task weblate.utils.tasks.heartbeat[ef11b782-7255-4958-90f6-9afefcb195f5] received weblate-1 | [2025-11-18 14:19:04,588: WARNING/312] Repository lock timeout: WeblateLockTimeoutError: Lock on myProject/global (repo) could not be acquired in 120s

I've read on
#4666 (comment)
and
#11717
that WEBLATE LOCK TIMEOUT should not happen anymore so I don't understand whats happening

I have the same output when I try to reset using the weblate API

am I using this wrong ? Does fixing the conflict will get everything working ? Can I fix the conflicts without pushing on the upstream repo ?

Thnks by advance

I already tried

• I've read and searched the documentation.
• I've searched for similar filed issues in this repository.

Steps to reproduce the behavior

Not sure about the step but my guess is

1. get conflicts on rebase
2. try to reset and reapply

Expected behavior

I would like the Reset And Reapply, or anyway to fix the conflicts without pushing to the upstream repo

Screenshots

No response

Exception traceback

How do you run Weblate?

Docker container

Weblate versions

5.14.3

Weblate deploy checks

Additional context

No response

[nijel]

The reset still needs a repository lock, the question is what is holding it for that log. Can you see that in the log?

[MaximeDametis]

Here is the log
Repository lock timeout: WeblateLockTimeoutError: Lock on myProject/global (repo) could not be acquired in 120s
"global" is the component that hold the vcs settings.
I have ~90 components that share this config like this weblate://myProject/global
All my components are unlocked according to the Repository maintenance UI

[nijel]

Most likely there is another operation ongoing on the repo and that should be visible in the log.