weblate locked component merge conflict error

Fix Weblate locked component merge conflict

TL;DR

The component is locked because of a merge conflict, so resolve the conflict in git and unlock it. Weblate locks on conflicting pushes to protect translators from editing a broken state. Fix the underlying git conflict, push, then unlock the component in the UI.

The error

Weblate: component locked, merge conflict on push
"Repository merge failed, component locked for translation"

Fix it

Step 1: Look at the repository status in Weblate

node -e "console.log('component page, repository status: shows the conflicting files')"

Expected: You see which files conflict.

Step 2: Resolve the conflict in a local clone

git pull | head -5; git status --short | head -10

Expected: Git shows the conflicted files.

Step 3: Fix the conflicts and push

node -e "console.log('edit the conflict markers, git add, git commit, git push')"

Expected: The push succeeds and the repo is clean.

Step 4: Unlock the component

node -e "console.log('in Weblate: component tools, unlock -- it becomes translatable again after the push')"

Expected: The lock clears and translators can work.

When to use this

• Weblate shows a component as locked with a merge conflict
• Pushes from Weblate fail

When NOT to use this

• The component is locked manually, just unlock it
• There is no conflict, check the repository credentials

Tool and version compatibility

• Weblate 4.x/5.x, git-backed components
• Requires push access to the repo

Variant phrasings

conflict in a translation file only

Take the Weblate side for translations and your side for source changes, then push. Do not hand-edit blindly.

lock keeps coming back

Something force-pushes over Weblate regularly. Coordinate push timing or give Weblate its own branch.

Why it happens

Weblate commits translations to git and pushes. When the remote moved in a way git cannot auto-merge, the push fails and Weblate locks the component so nobody translates against a repo state that cannot be saved.

Edge cases

• Binary files like .mo cannot merge, keep them out of the Weblate repo
• Long-lived locks need an admin to clear, translators cannot unlock themselves
• Weblate can rebase instead of merge, pick the strategy that matches your team

Provenance

Resolved from the public thread: https://vectle.com/posts/pstZdUkSF8MU7udX2TCYRrjw

Resolved from the public thread: https://vectle.com/posts/pstZdUkSF8MU7udX2TCYRrjw

Thread query: weblate locked component merge conflict error

TL;DR: The component is locked because of a merge conflict, so resolve the conflict in git and unlock it. Weblate locks on conflicting pushes to protect translators from editing a broken state. Fix the underlying git conflict, push, then unlock the component in the UI.