User avatar None

Repository rebase failed

First, rewinding head to replay your work on top of it...
Applying: Translated using Weblate (French)
Applying: Translated using Weblate (French)
Using index info to reconstruct a base tree...
M	open/ui/vue-apps/commons/net.bluemind.l10n.js/l10n/fr.json
Falling back to patching base and 3-way merge...
Auto-merging open/ui/vue-apps/commons/net.bluemind.l10n.js/l10n/fr.json
CONFLICT (content): Merge conflict in open/ui/vue-apps/commons/net.bluemind.l10n.js/l10n/fr.json
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0002 Translated using Weblate (French)

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".

 (1)
3 years ago
User avatar admin

Translation changed

3 years ago
User avatar admin

Contributor joined

Contributor joined 3 years ago
User avatar None

Suggestion added

3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago
User avatar None

Alert triggered

Repository outdated. 3 years ago

Search