 deepbluev7
Repository rebase failed |
4 years ago
|
|
deepbluev7
Changes committed |
Changes committed
4 years ago
|
 None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |
|
None
Repository rebase failed |
First, rewinding head to replay your work on top of it... Applying: Translated using Weblate (German) Using index info to reconstruct a base tree... M resources/langs/nheko_de.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_de.ts Applying: Translated using Weblate (English) Using index info to reconstruct a base tree... M resources/langs/nheko_en.ts Falling back to patching base and 3-way merge... Auto-merging resources/langs/nheko_en.ts CONFLICT (content): Merge conflict in resources/langs/nheko_en.ts error: Failed to merge in the changes. Patch failed at 0002 Translated using Weblate (English) Use 'git am --show-current-patch' to see the failed patch 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". (128)4 years ago |