Hi,
Can someone please look at https://github.com/FedoraQt/MediaWriter/issues/645? The repository for Fedora Media Writer cannot now merge changes as there is a conflict.
Thank you.
Regards, Jan Grulich
Hi,
Just for the record, I closed the issue #645 because alerts are now gone and the translation update PR #646 was open.
Cheers, Rafael
On Thu, Sep 14, 2023 at 2:44 AM Jan Grulich jgrulich@redhat.com wrote:
Hi,
Can someone please look at https://github.com/FedoraQt/MediaWriter/issues/645? The repository for Fedora Media Writer cannot now merge changes as there is a conflict.
Thank you.
Regards, Jan Grulich
trans mailing list -- trans@lists.fedoraproject.org To unsubscribe send an email to trans-leave@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/trans@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Thank you for fixing it!
Regards, Jan
čt 14. 9. 2023 v 8:54 odesílatel Rafael Fontenelle rafaelff@gnome.org napsal:
Hi,
Just for the record, I closed the issue #645 because alerts are now gone and the translation update PR #646 was open.
Cheers, Rafael
On Thu, Sep 14, 2023 at 2:44 AM Jan Grulich jgrulich@redhat.com wrote:
Hi,
Can someone please look at https://github.com/FedoraQt/MediaWriter/issues/645? The repository for Fedora Media Writer cannot now merge changes as there is a conflict.
Thank you.
Regards, Jan Grulich
trans mailing list -- trans@lists.fedoraproject.org To unsubscribe send an email to trans-leave@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/trans@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
trans mailing list -- trans@lists.fedoraproject.org To unsubscribe send an email to trans-leave@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/trans@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Hi,
This seems to be the case again. May I please ask for a fix for the merge conflict?
Thank you.
Regards, Jan
čt 14. 9. 2023 v 9:06 odesílatel Jan Grulich jgrulich@redhat.com napsal:
Thank you for fixing it!
Regards, Jan
čt 14. 9. 2023 v 8:54 odesílatel Rafael Fontenelle rafaelff@gnome.org napsal:
Hi,
Just for the record, I closed the issue #645 because alerts are now gone and the translation update PR #646 was open.
Cheers, Rafael
On Thu, Sep 14, 2023 at 2:44 AM Jan Grulich jgrulich@redhat.com wrote:
Hi,
Can someone please look at https://github.com/FedoraQt/MediaWriter/issues/645? The repository for Fedora Media Writer cannot now merge changes as there is a conflict.
Thank you.
Regards, Jan Grulich
trans mailing list -- trans@lists.fedoraproject.org To unsubscribe send an email to trans-leave@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/trans@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
trans mailing list -- trans@lists.fedoraproject.org To unsubscribe send an email to trans-leave@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/trans@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
Hi,
From Weblate interface, I tried updating from the upstream repository and also pushing changes to it, without success.
You have access to both Weblate project and the upstream repository, so it seems it needs your action.
The error:
---- Rebasing (1/14) Auto-merging po/mediawriter_fi.po CONFLICT (content): Merge conflict in po/mediawriter_fi.po error: could not apply 4b52fa0... Translated using Weblate (Finnish) 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 4b52fa0... Translated using Weblate (Finnish) (1) ----
Weblate recommends some steps to fix the issue (which requires access to the upstream repository): https://translate.fedoraproject.org/projects/fedora-media-writer/mediawriter...
Please try to follow these instructions and let us know if any questions arise.
Best regards, Rafael
Em ter., 10 de set. de 2024 08:38, Jan Grulich jgrulich@redhat.com escreveu:
Hi,
This seems to be the case again. May I please ask for a fix for the merge conflict?
Thank you.
Regards, Jan
čt 14. 9. 2023 v 9:06 odesílatel Jan Grulich jgrulich@redhat.com napsal:
Thank you for fixing it!
Regards, Jan
čt 14. 9. 2023 v 8:54 odesílatel Rafael Fontenelle rafaelff@gnome.org napsal:
Hi,
Just for the record, I closed the issue #645 because alerts are now gone and the translation update PR #646 was open.
Cheers, Rafael
On Thu, Sep 14, 2023 at 2:44 AM Jan Grulich jgrulich@redhat.com wrote:
Hi,
Can someone please look at https://github.com/FedoraQt/MediaWriter/issues/645?? The repository for Fedora Media Writer cannot now merge changes as there is a conflict.
Thank you.
Regards, Jan Grulich
trans mailing list -- trans@lists.fedoraproject.org To unsubscribe send an email to trans-leave@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/trans@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
trans mailing list -- trans@lists.fedoraproject.org To unsubscribe send an email to trans-leave@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/trans@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
-- _______________________________________________ trans mailing list -- trans@lists.fedoraproject.org To unsubscribe send an email to trans-leave@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/trans@lists.fedoraproject.org Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue