ismailgulekFirst, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M Riot/Assets/de.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/de.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings CONFLICT (content): Merge conflict in Riot/Assets/nl.lproj/Vector.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 Translated using Weblate (Dutch) 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)2 years ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M Riot/Assets/de.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/de.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings CONFLICT (content): Merge conflict in Riot/Assets/nl.lproj/Vector.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 Translated using Weblate (Dutch) 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)2 years ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M Riot/Assets/de.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/de.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings CONFLICT (content): Merge conflict in Riot/Assets/nl.lproj/Vector.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 Translated using Weblate (Dutch) 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)2 years ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M Riot/Assets/de.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/de.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings CONFLICT (content): Merge conflict in Riot/Assets/nl.lproj/Vector.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 Translated using Weblate (Dutch) 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)2 years ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M Riot/Assets/de.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/de.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings CONFLICT (content): Merge conflict in Riot/Assets/nl.lproj/Vector.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 Translated using Weblate (Dutch) 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)2 years ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M Riot/Assets/de.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/de.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings CONFLICT (content): Merge conflict in Riot/Assets/nl.lproj/Vector.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 Translated using Weblate (Dutch) 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)2 years ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M Riot/Assets/de.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/de.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings CONFLICT (content): Merge conflict in Riot/Assets/nl.lproj/Vector.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 Translated using Weblate (Dutch) 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)2 years ago
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M Riot/Assets/de.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/de.lproj/Vector.strings No changes -- Patch already applied. Applying: Translated using Weblate (Dutch) Using index info to reconstruct a base tree... M Riot/Assets/nl.lproj/Vector.strings Falling back to patching base and 3-way merge... Auto-merging Riot/Assets/nl.lproj/Vector.strings CONFLICT (content): Merge conflict in Riot/Assets/nl.lproj/Vector.strings error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 Translated using Weblate (Dutch) 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)2 years ago