David Revoy
@deevad Inscrit le 5 août 2021 Pepper&Carrot Montauban, France
www.davidrevoy.com info@davidrevoy.com davidrevoy framapiaf.org/@davidrevoy Deevad framagit.org/Deevad davidrevoy
deevad
Échec de la fusion de dépôt |
Il y a un an
|
deevad
Échec du rebasement du dépôt |
Rebasing (1/1) .merge_file_8ZZkRN:1078: duplicate message definition... .merge_file_8ZZkRN:380: ...this is the location of the first definition msggrep: found 1 fatal error ### /var/www/weblate/weblate-env/lib/python3.9/site-packages/weblate/examples/git-merge-gettext-po: error near line 170: status 1 error: could not apply 4b3b380... Translated using Weblate (Ukrainian) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 4b3b380... Translated using Weblate (Ukrainian) Auto-merging po/uk.po CONFLICT (content): Merge conflict in po/uk.po (1)Il y a un an |
deevad
Échec de la fusion de dépôt |
Auto-merging po/uk.po CONFLICT (content): Merge conflict in po/uk.po Automatic merge failed; fix conflicts and then commit the result. (1)Il y a un an |
deevad
Échec du rebasement du dépôt |
Rebasing (1/1) .merge_file_UdNC7v:1078: duplicate message definition... .merge_file_UdNC7v:380: ...this is the location of the first definition msggrep: found 1 fatal error ### /var/www/weblate/weblate-env/lib/python3.9/site-packages/weblate/examples/git-merge-gettext-po: error near line 170: status 1 error: could not apply 4b3b380... Translated using Weblate (Ukrainian) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 4b3b380... Translated using Weblate (Ukrainian) Auto-merging po/uk.po CONFLICT (content): Merge conflict in po/uk.po (1)Il y a un an |
deevad
Échec du rebasement du dépôt |
Rebasing (1/1) error: could not apply 4b3b380... Translated using Weblate (Ukrainian) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 4b3b380... Translated using Weblate (Ukrainian) Auto-merging po/uk.po CONFLICT (content): Merge conflict in po/uk.po (1)Il y a un an |
deevad
Échec du rebasement du dépôt |
Rebasing (1/1) error: could not apply 4b3b380... Translated using Weblate (Ukrainian) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". Could not apply 4b3b380... Translated using Weblate (Ukrainian) Auto-merging po/uk.po CONFLICT (content): Merge conflict in po/uk.po (1)Il y a un an |
deevad
Traduction ajoutée |
|
deevad
Traduction ajoutée |
|
deevad
Traduction ajoutée |
|
deevad
Traduction modifiée |
|