cynthiaFirst, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M source/locale/en/LC_MESSAGES/manual/05-zonings.po Falling back to patching base and 3-way merge... Auto-merging source/locale/en/LC_MESSAGES/manual/05-zonings.po CONFLICT (content): Merge conflict in source/locale/en/LC_MESSAGES/manual/05-zonings.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (English) 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)5 years ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M source/locale/en/LC_MESSAGES/manual/05-zonings.po Falling back to patching base and 3-way merge... Auto-merging source/locale/en/LC_MESSAGES/manual/05-zonings.po CONFLICT (content): Merge conflict in source/locale/en/LC_MESSAGES/manual/05-zonings.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (English) 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)5 years ago
NoneFirst, rewinding head to replay your work on top of it... Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M source/locale/en/LC_MESSAGES/manual/05-zonings.po Falling back to patching base and 3-way merge... Auto-merging source/locale/en/LC_MESSAGES/manual/05-zonings.po CONFLICT (content): Merge conflict in source/locale/en/LC_MESSAGES/manual/05-zonings.po error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Translated using Weblate (English) 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)5 years ago