Hi,
Looks like the components for the "fedora-docs-l10n/fedora-release-notes" project are locked due to "Could not merge the repository." alert.
Can some doc-l10n admin please take a look at it?
The alert page (e.g. https://translate.fedoraproject.org/projects/fedora-docs-l10n-fedora-release-notes/rawhidepageswelcomewelcome/#alerts) says (it is all quote from now on):
--------------------------------------------
Weblate could not merge upstream changes while updating the repository.
```
Rebasing (1/10)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
CONFLICT (modify/delete): po/ko/f38/pages/sysadmin/Installation.po deleted in HEAD and modified in 63816e596b5 (Translated using Weblate (Korean)). Version 63816e596b5 (Translated using Weblate (Korean)) of po/ko/f38/pages/sysadmin/Installation.po left in tree.
error: could not apply 63816e596b5... Translated using Weblate (Korean)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 63816e596b5... Translated using Weblate (Korean)
(1)
Rebasing (2/10)
Rebasing (3/10)
Rebasing (4/10)
Rebasing (5/10)
Rebasing (6/10)
Rebasing (7/10)
Rebasing (8/10)
Rebasing (9/10)
CONFLICT (modify/delete): po/ko/f38/pages/sysadmin/Installation.po deleted in HEAD and modified in 63816e596b5 (Translated using Weblate (Korean)). Version 63816e596b5 (Translated using Weblate (Korean)) of po/ko/f38/pages/sysadmin/Installation.po left in tree.
error: could not apply 63816e596b5... Translated using Weblate (Korean)
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 63816e596b5... Translated using Weblate (Korean)
(1)
```
Typical workflow for fixing merge conflicts
Commit all pending changes in Weblate and lock the translation component.
wlc commit; wlc lock
Add Weblate exported repository as a remote.
git remote add weblate https://translate.fedoraproject.org/git/fedora-docs-l10n-fedora-release-notes/nav/ ; git remote update weblate
Merge Weblate changes and resolve any conflicts.
git merge weblate/
Rebase Weblate changes on top of upstream and resolve any conflicts.
git rebase origin/
Push changes into upstream repository.
git push origin
Weblate should now be able to see updated repository and you can unlock it.
wlc pull ; wlc unlock
Check the FAQ for info on how to resolve this. (https://docs.weblate.org/en/weblate-4.18.2/faq.html#merge)
Commit all pending changes in Weblate and lock the translation component.
wlc commit; wlc lock
Add Weblate exported repository as a remote.
git remote add weblate https://translate.fedoraproject.org/git/fedora-docs-l10n-fedora-release-notes/nav/ ; git remote update weblate
Merge Weblate changes and resolve any conflicts.
git merge weblate/
Rebase Weblate changes on top of upstream and resolve any conflicts.
git rebase origin/
Push changes into upstream repository.
git push origin
Weblate should now be able to see updated repository and you can unlock it.
wlc pull ; wlc unlock
Check the FAQ for info on how to resolve this. (https://docs.weblate.org/en/weblate-4.18.2/faq.html#merge)
----------------------------------------------------------------
No comments:
Post a Comment